diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 6ff1beb6..0cd88e30 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pacman pkgver=6.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="A library-based package manager with dependency support (MSYS2 port)" arch=('i686' 'x86_64') url="https://www.archlinux.org/pacman/" @@ -79,10 +79,10 @@ source=(pacman-${pkgver}::git+https://gitlab.archlinux.org/pacman/pacman.git#com 0031-repo-add-unconditionally-create-the-database-if-it-i.patch) validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) -sha256sums=('SKIP' +sha256sums=('803cba087e713a59866797747c3c63abbc0e4354c45cc2c0467d11e78364d66f' '53c0c2d42bc10f265aa41bc412a6ebc2d98177d9356b0fa9a2a130caec46ac2d' '98bc3b83665ce0a102cd74b2a8e69c17eb6b55e0f89f17e57dc37d0f4577093a' - 'c87b29ee8360be2e02ee959bad71efdb357a8fd57b70398046d192643305263b' + '0e06c5e3988c7cf1e4a340fd5f139268a66da596499a1b839d26a0b44c265a62' '98198e1f0f252eae0560d271bee4b9149e127399dd0d3fd5d8d24579d9e0550f' '167e9ffe59e55fb07d47e0c9a4bddd9d967c50ec2c8711a0a0bbe4b184fc8b0f' '1021dc5950ff9f9efac795688c4b53a1d3cda42b0f270ee755a038bbcf9eccab' diff --git a/pacman/makepkg_mingw.conf b/pacman/makepkg_mingw.conf index c39041db..2e9562cb 100644 --- a/pacman/makepkg_mingw.conf +++ b/pacman/makepkg_mingw.conf @@ -45,6 +45,7 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" CXXFLAGS="$CFLAGS" LDFLAGS="" + RUSTFLAGS="-Cforce-frame-pointers=yes" elif [[ "$MSYSTEM" == "MINGW32" ]]; then CARCH="i686" CHOST="i686-w64-mingw32" @@ -57,6 +58,7 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware" + RUSTFLAGS="-Cforce-frame-pointers=yes" elif [[ "$MSYSTEM" == "CLANG64" ]]; then CARCH="x86_64" CHOST="x86_64-w64-mingw32" @@ -69,6 +71,7 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" CXXFLAGS="$CFLAGS" LDFLAGS="" + RUSTFLAGS="-Cforce-frame-pointers=yes" elif [[ "$MSYSTEM" == "CLANG32" ]]; then CARCH="i686" CHOST="i686-w64-mingw32" @@ -81,6 +84,7 @@ elif [[ "$MSYSTEM" == "CLANG32" ]]; then CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware" + RUSTFLAGS="-Cforce-frame-pointers=yes" elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then CARCH="aarch64" CHOST="aarch64-w64-mingw32" @@ -93,6 +97,7 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" CXXFLAGS="$CFLAGS" LDFLAGS="" + RUSTFLAGS="-Cforce-frame-pointers=yes" elif [[ "$MSYSTEM" == "UCRT64" ]]; then CARCH="x86_64" CHOST="x86_64-w64-mingw32" @@ -105,6 +110,7 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong" CXXFLAGS="$CFLAGS" LDFLAGS="" + RUSTFLAGS="-Cforce-frame-pointers=yes" else echo "Unsupported MSYSTEM: $MSYSTEM" exit 1