| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | core/pacman/PKGBUILD | 28 | ||||
| -rw-r--r-- | core/pacman/makepkg.conf | 17 |
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index b8f350ea..e5966c06 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 "$( { @@ -42,20 +42,20 @@ if [ "${CARCH}" = "i486" ]; then )" fi +# If this still applies, it only does for i486: +if [ "${CARCH}" = "i486" ]; then # broken Python/asciidoc -eval "$( - declare -f build | \ - sed ' - /meson/s/-Ddoc=enabled/-Ddoc=disabled/ - ' -)" - -# overload wrong checksums -sha256sums[11]='468837eed9a4ffd3778f159a7e62f89a38a4244f822a3a5b014daa69e3c65d28' -sha256sums[13]='d08d4a56dc3a977fdfd4591c30733fa28976710ffba53786541d98717892dc24' -sha256sums[14]='4a3cdfba490121a20f3648791cd47ba323f3d3d56bf7ced21b9badb1f22d6abc' + eval "$( + declare -f build | \ + sed ' + /meson/s/-Ddoc=enabled/-Ddoc=disabled/ + ' + )" +fi # gettext is linked against old ICU verison on i486, use ICU 72 stub if [ "${CARCH}" = "i486" ]; then makedepends+=(icu72) fi + +sha256sums[0]='SKIP' diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf index d333a442..69c05355 100644 --- a/core/pacman/makepkg.conf +++ b/core/pacman/makepkg.conf @@ -41,12 +41,14 @@ 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 \ - -fstack-clash-protection -fcf-protection" + -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" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" +LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ + -Wl,-z,pack-relative-relocs" LTOFLAGS="-flto=auto" -RUSTFLAGS="" +RUSTFLAGS="-Cforce-frame-pointers=yes" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags @@ -81,7 +83,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto) +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -93,8 +95,9 @@ BUILDENV=(!distcc color !ccache check !sign) #-- purge: Remove files specified by PURGE_TARGETS #-- debug: Add debugging flags as specified in DEBUG_* variables #-- lto: Add compile flags for building with link time optimization +#-- autodeps: Automatically add depends/provides # -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto) #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 INTEGRITY_CHECK=(sha256) @@ -112,6 +115,8 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #-- Directory to store source code in for debug packages DBGSRCDIR="/usr/src/debug" +#-- Prefix and directories for library autodeps +LIB_DIRS=('lib:usr/lib') ######################################################################### # PACKAGE OUTPUT |