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 17:31:52 +0200
committerErich Eckner <git@eckner.net>2022-12-08 12:57:22 +0100
commitc7984ae4978267b5579f592beb5da32ba6d4e350 (patch)
treee0ae06212fae0cdf14872a77f87610d3f8aa6045
parent51a57799cd73706c8905b4736b6023954193adc0 (diff)
patch out -fcf-protection from makepkg.conf for i486 and i686
-rw-r--r--Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e3593f7..c7ed3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -117,12 +117,18 @@ GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
$(BUILDDIR)/config/makepkg-i486.conf: config/makepkg/x86_64.conf
@echo "GEN $(notdir $@)"
@mkdir -p $(dir $@)
- @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g' "$<" > "$@"
+ @sed '
+ s,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g; \
+ s,-fcf-protection,,g; \
+ ' "$<" > "$@"
$(BUILDDIR)/config/makepkg-i686.conf: config/makepkg/x86_64.conf
@echo "GEN $(notdir $@)"
@mkdir -p $(dir $@)
- @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@"
+ @sed '
+ s,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g; \
+ s,-fcf-protection,,g; \
+ ' "$<" > "$@"
$(BUILDDIR)/config/makepkg-pentium4.conf: $(BUILDDIR)/config/makepkg-i686.conf
@echo "GEN $(notdir $@)"