summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/mksh/patches/patch-Build_sh10
-rw-r--r--package/mksh/patches/patch-dot_mkshrc4
-rw-r--r--package/openssh/Makefile6
3 files changed, 18 insertions, 2 deletions
diff --git a/package/mksh/patches/patch-Build_sh b/package/mksh/patches/patch-Build_sh
new file mode 100644
index 000000000..3bd7547b7
--- /dev/null
+++ b/package/mksh/patches/patch-Build_sh
@@ -0,0 +1,10 @@
+--- 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' \
diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc
index 2b215b93e..03e0b73ba 100644
--- a/package/mksh/patches/patch-dot_mkshrc
+++ b/package/mksh/patches/patch-dot_mkshrc
@@ -1,5 +1,5 @@
---- mksh/dot.mkshrc~ Thu Feb 25 20:48:10 2010
-+++ mksh/dot.mkshrc Sun Feb 28 18:05:10 2010
+--- mksh.orig/dot.mkshrc 2011-04-14 19:46:02.037662289 +0200
++++ mksh/dot.mkshrc 2011-04-14 10:11:18.977672397 +0200
@@ -21,7 +21,7 @@
#-
# ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 2023a4bbb..64a71f7d8 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -49,6 +49,12 @@ ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y)
CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr"
endif
+ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+CONFIGURE_ARGS+= --with-stackprotect
+else
+CONFIGURE_ARGS+= --without-stackprotect
+endif
+
CONFIGURE_ENV+= LD='${TARGET_CC}' \
ac_cv_func_setlogin=no \
ac_cv_lib_nsl_yp_match=no