diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-06-18 09:49:45 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-06-18 09:49:45 +0000 |
| commit | 2fb09857e1ed0dd132c5347829d701d7f7fb66ad (patch) | |
| tree | 81c125f794eb4f4bdba62595a3d290cfe3d757fd | |
| parent | 614678d9299e53c633d81835c6c7aeb6507d9fd5 (diff) | |
| download | master-31e0f0ae-2fb09857e1ed0dd132c5347829d701d7f7fb66ad.tar.gz master-31e0f0ae-2fb09857e1ed0dd132c5347829d701d7f7fb66ad.tar.bz2 master-31e0f0ae-2fb09857e1ed0dd132c5347829d701d7f7fb66ad.zip | |
uclibc: unbreak after enabling SSP
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 46034
| -rw-r--r-- | toolchain/uClibc/common.mk | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/config-0.9.33.2/common | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk index 89810a0b9a..a4d29c93d5 100644 --- a/toolchain/uClibc/common.mk +++ b/toolchain/uClibc/common.mk @@ -78,7 +78,7 @@ define Host/Configure -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \ -e 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \ -e 's,^.*UCLIBC_BUILD_ALL_LOCALE.*,UCLIBC_BUILD_ALL_LOCALE=$(if $(CONFIG_BUILD_NLS),y,n),g' \ - -e 's,^.*UCLIBC_HAS_SSP.*,UCLIBC_HAS_SSP=$(if $(or $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),$(CONFIG_PKG_CC_STACKPROTECTOR_STRONG)),y,n),g' \ + -e 's,^.*UCLIBC_HAS_SSP[^_]*,UCLIBC_HAS_SSP=$(if $(or $(CONFIG_PKG_CC_STACKPROTECTOR_REGULAR),$(CONFIG_PKG_CC_STACKPROTECTOR_STRONG)),y,n),g' \ $(HOST_BUILD_DIR)/.config.new cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \ cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \ diff --git a/toolchain/uClibc/config-0.9.33.2/common b/toolchain/uClibc/config-0.9.33.2/common index 457d21f638..b948d4bbb9 100644 --- a/toolchain/uClibc/config-0.9.33.2/common +++ b/toolchain/uClibc/config-0.9.33.2/common @@ -158,6 +158,7 @@ UCLIBC_HAS_SIGNUM_MESSAGES=y UCLIBC_HAS_SOCKET=y UCLIBC_HAS_SOFT_FLOAT=y # UCLIBC_HAS_SSP is not set +# UCLIBC_HAS_SSP_COMPAT is not set UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set # UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set |