From c7984ae4978267b5579f592beb5da32ba6d4e350 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sat, 1 May 2021 17:31:52 +0200 Subject: patch out -fcf-protection from makepkg.conf for i486 and i686 --- Makefile | 10 ++++++++-- 1 file 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 $@)" -- cgit v1.2.3-70-g09d2