diff options
| -rw-r--r-- | core/pacman/PKGBUILD | 9 | ||||
| -rw-r--r-- | core/pacman/makepkg.conf | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 090d7a24..e7e5974b 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,11 +1,11 @@ -# upstream git revision: 65d13ac09a0c56a80a71280d5669eb8a8f557426 +# upstream git revision: 557099dcb495b55b563735a21fdc393d0fc050fb depends+=(archlinux32-keyring) # fail if upstream changes makepkg.conf or pacman.conf for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '8bf61d04aa67979e58bada8538f62b4b37a58bab1aabe97d6b148da0f4c920d9' ]; then - sha256sums[${i}]='f3ce4ba937ff47c10ae4b7c3b4e46bac3aa8975b1a9171eb95fdd3dd68fe4251' + if [ "${sha256sums[${i}]}" = '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6' ]; then + sha256sums[${i}]='2ad58ba534fed9d728d273c7b5920a495c15cfb58b5c3864bfa023a939abc5d0' fi if [ "${sha256sums[${i}]}" = '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7' ]; then sha256sums[${i}]='fa05e6f8a83f09fc347988a8ad9dce6fad50d542b2d77fc07fd1b604309990be' @@ -39,7 +39,7 @@ eval "$( )" # not supported on i486 -fcf-protection - +# LTO currently no availavle on i486 if [ "${CARCH}" = "i486" ]; then eval "$( { @@ -48,6 +48,7 @@ if [ "${CARCH}" = "i486" ]; then } \ | sed ' $i sed -i "s/-fcf-protection//g" "$pkgdir/etc/makepkg.conf" + $i sed -i "s/LTOFLAGS.*/LTOFLAGS=\\\"-fno-lto\\\"/" "$pkgdir/etc/makepkg.conf" ' )" fi diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf index 98bca384..12bd0a97 100644 --- a/core/pacman/makepkg.conf +++ b/core/pacman/makepkg.conf @@ -43,12 +43,13 @@ CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ -fstack-clash-protection -fcf-protection" CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" +LTOFLAGS="-flto=auto" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags -DEBUG_CFLAGS="-g -fvar-tracking-assignments" -DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" #DEBUG_RUSTFLAGS="-C debuginfo=2" ######################################################################### |