summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorThorsten Glaser <tg@mirbsd.org>2011-12-11 19:58:12 +0000
committerWaldemar Brodkorb <wbx@openadk.org>2011-12-18 17:30:02 +0100
commit529d3cdead0d21086c4d6e2931d1b683d125e408 (patch)
tree375df5827eca598f29268d2513619232849fbb9b /package
parent517022211cab2644bac88865e29af726f1aafeaf (diff)
use proper method to disable a flag
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Diffstat (limited to 'package')
-rw-r--r--package/mksh/Makefile1
-rw-r--r--package/mksh/patches/patch-Build_sh10
2 files changed, 1 insertions, 10 deletions
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index a599d572f..786e08054 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -33,6 +33,7 @@ INSTALL_STYLE:= manual
do-build:
cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+ HAVE_CAN_FSTACKPROTECTORALL=0 \
TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -combine
do-install:
diff --git a/package/mksh/patches/patch-Build_sh b/package/mksh/patches/patch-Build_sh
deleted file mode 100644
index 3bd7547b7..000000000
--- a/package/mksh/patches/patch-Build_sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- mksh.orig/Build.sh 2011-04-14 19:46:02.037662289 +0200
-+++ mksh/Build.sh 2011-04-14 19:45:49.357672498 +0200
-@@ -816,7 +816,6 @@ if test $ct = gcc; then
- # The following tests run with -Werror (gcc only) if possible
- NOWARN=$DOWARN; phase=u
- ac_flags 1 fnostrictaliasing -fno-strict-aliasing
-- ac_flags 1 fstackprotectorall -fstack-protector-all
- ac_flags 1 fwrapv -fwrapv
- test $cm = combine && ac_flags 0 combine \
- '-fwhole-program --combine' \