Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-05-01 12:56:48 +0200
committerErich Eckner <git@eckner.net>2021-05-01 12:56:58 +0200
commit80ef7a5b40d993d25f13d0767c912d8c7276dc9b (patch)
tree9d53249eb41e8a3cb5b29f637cfd44a0cd354450
parent811fa6e97bee07f104ca8e8d09e146704a2a7abe (diff)
core/pacman: drom -fcf-protection from makepkg.conf - it makes trouble on i486, is irelevant on i686 and was not enabled anyways before
-rw-r--r--core/pacman/PKGBUILD2
-rw-r--r--core/pacman/makepkg.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 4f96a69..7429bd4 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -5,7 +5,7 @@ depends+=(archlinux32-keyring)
# fail if upstream changes makepkg.conf or pacman.conf
for ((i=0; i<${#sha256sums[@]}; i++)); do
if [ "${sha256sums[${i}]}" = '46a7fda0f2ebd2957db1c0264ed8a659df0916ba30e1353ecc70ef47d2b118ff' ]; then
- sha256sums[${i}]='7711617e2daaf8cee3221bea3533e94a3e1e4d615b33880a74706754f491e806'
+ sha256sums[${i}]='0af8eda66e530096cd4ff3e64f0b1ef2af669a7fb31b85faf9e6d906c6098ba1'
fi
if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index c6e79cb..006ece0 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -40,7 +40,7 @@ CPPFLAGS=""
CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
-Wformat -Werror=format-security \
- -fstack-clash-protection -fcf-protection"
+ -fstack-clash-protection"
CXXFLAGS="$CFLAGS"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
#RUSTFLAGS="-C opt-level=2"