helix,ruff,zed: remove lto workarounds

msys2 · Dec 9, 2024 · 86b9c8d · 86b9c8d
1 parent 08a5617
commit 86b9c8d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 26 deletions.
diff --git a/mingw-w64-helix/PKGBUILD b/mingw-w64-helix/PKGBUILD
@@ -4,7 +4,7 @@ _realname=helix
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=24.07
-pkgrel=4
+pkgrel=5
 pkgdesc="A post-modern modal text editor (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -19,12 +19,10 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-rust-analyzer: Rust LSP"
             "${MINGW_PACKAGE_PREFIX}-lldb: for lldb-dap")
 source=("$url/archive/$pkgver/${_realname}-${pkgver}.tar.gz"
         'icon.patch'
-        'disable-lto.patch'
         'fix-runtime-dir.patch')
 noextract=("${_realname}-${pkgver}.tar.gz")
 sha256sums=('0f466ed2de039a7eca6faf29fc0db712c92e1a59d0bdc7e8916c717ceee8b3b3'
             'f45f0656cb1ceb5c90925c80b093335622f9ad3f64d4e2c8a3a0ea0ab43d900e'
-            'b00901a867835eda4e13654590ff9380568dee7ed9ac3f4b8e0951c89b0b6d8f'
             'f071538f25e12ca0898c61daa3a2fbf9416a5be4f014682942dcf34dfb0f1335')
 
 prepare() {
@@ -54,7 +52,6 @@ END
     "vendor/windows-targets-0.48.0/.cargo-checksum.json"
 
   patch -Np1 -i ../icon.patch
-  patch -Np1 -i ../disable-lto.patch
   patch -Np1 -i ../fix-runtime-dir.patch
 }
 

diff --git a/mingw-w64-helix/disable-lto.patch b/mingw-w64-helix/disable-lto.patch
diff --git a/mingw-w64-ruff/PKGBUILD b/mingw-w64-ruff/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An extremely fast Python linter, written in Rust (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -42,9 +42,6 @@ build() {
   cd "${_realname}"
 
   export WINAPI_NO_BUNDLED_LIBRARIES=1
-  if [[ ${MINGW_PACKAGE_PREFIX} != *clang-* ]]; then
-    export CARGO_PROFILE_RELEASE_LTO="fat"
-  fi
   maturin build --release --strip --frozen --all-features
 }
 

diff --git a/mingw-w64-zed/PKGBUILD b/mingw-w64-zed/PKGBUILD
@@ -4,7 +4,7 @@ _realname=zed
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.164.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-performance, multiplayer code editor (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -29,7 +29,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-openssl"
              #"${MINGW_PACKAGE_PREFIX}-sqlite3"
              "${MINGW_PACKAGE_PREFIX}-cargo-about"
-             "${MINGW_PACKAGE_PREFIX}-lld"
              'git')
 options=('!lto')
 optdepends=("${MINGW_PACKAGE_PREFIX}-ollama: provides LLMs for assistance panel"
@@ -94,9 +93,6 @@ build() {
   export ZED_UPDATE_EXPLANATION='Updates are handled by pacman'
   export CARGO_PROFILE_RELEASE_DEBUG=0
   export RELEASE_VERSION="${pkgver} (Rev${pkgrel}, Built by MSYS2 project)"
-  if [[ $MINGW_PACKAGE_PREFIX != *-clang-* ]]; then
-    export RUSTFLAGS+=" -Clink-arg=-fuse-ld=lld"
-  fi
 
   cargo build --release --frozen -p zed
 }