index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | core/pacman/PKGBUILD | 9 | ||||
-rw-r--r-- | core/pacman/makepkg.conf | 2 |
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index a52ebe11..db5f4396 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -4,8 +4,8 @@ depends+=(archlinux32-keyring) # fail if upstream changes makepkg.conf or pacman.conf for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = 'f2791b51588104ec6dbaafa389451056f3c61fa6c19510dcce3a9a6cc19cba29' ]; then - sha256sums[${i}]='d7e2516889c62cd3d0c1f2af5199fe0564c5ef35900d6b6551a8c9ce1c80f95a' + if [ "${sha256sums[${i}]}" = '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef' ]; then + sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' fi if [ "${sha256sums[${i}]}" = '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' ]; then sha256sums[${i}]='663cbfe0643ff78c1eeb38d59046707da49bde6ab8226fbc5844457a985cb5bc' @@ -28,7 +28,7 @@ source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch') sha256sums+=('6a7906bd28a57cbcff58d856ffefbbb9096a163aaff79913b4fac69d75d0028a') # not supported on i486 -fcf-protection -# LTO currently no availavle on i486 +# LTO currently no available on i486 if [ "${CARCH}" = "i486" ]; then eval "$( { @@ -50,9 +50,6 @@ eval "$( ' )" -# overload checksum of makepkg.conf (which has local adaptions) -sha256sums[10]='ba8b4b35721d18cb98f1955a0e88bf8555aa348d00cb6325fcb80faf36b3047b' - # gettext is linked against old ICU verison on i486, use ICU 72 stub if [ "${CARCH}" = "i486" ]; then makedepends+=(icu72) diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf index 1f55bf32..69c05355 100644 --- a/core/pacman/makepkg.conf +++ b/core/pacman/makepkg.conf @@ -41,7 +41,7 @@ CHOST="i686-pc-linux-gnu" #-- Compiler and Linker Flags #CPPFLAGS="" CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection \ -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" |