Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2024-04-21 11:43:33 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2024-04-21 11:43:33 +0200
commit048b0dfaf886672ffe153e8cd397bd997ab37d7a (patch)
treea589497dda4ee2ef4245dce4bd0a5b47e75a7a36
parentdc5c68dca8eca3620fbab85e23136652b045aac2 (diff)
core/pacman: merged makepkg.conf with 6.1 version
-rw-r--r--core/pacman/PKGBUILD8
-rw-r--r--core/pacman/makepkg.conf15
2 files changed, 14 insertions, 9 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index b8f350ea..a52ebe11 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -50,12 +50,12 @@ eval "$(
'
)"
-# overload wrong checksums
-sha256sums[11]='468837eed9a4ffd3778f159a7e62f89a38a4244f822a3a5b014daa69e3c65d28'
-sha256sums[13]='d08d4a56dc3a977fdfd4591c30733fa28976710ffba53786541d98717892dc24'
-sha256sums[14]='4a3cdfba490121a20f3648791cd47ba323f3d3d56bf7ced21b9badb1f22d6abc'
+# 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)
fi
+
+sha256sums[0]='SKIP'
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index d333a442..1f55bf32 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -42,11 +42,13 @@ CHOST="i686-pc-linux-gnu"
#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"
+ -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