Browse Source

handle ssp better

Waldemar Brodkorb 13 years ago
parent
commit
bf8ea1e9e9

+ 10 - 0
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' \

+ 2 - 2
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

+ 6 - 0
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