aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-23 10:43:19 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-23 10:43:19 +0000
commit2086f7284c63d759071729108e35687c4679b9fc (patch)
treebd5e5dd9ff524a807d42d3ac654c9c8aa4688f26
parent6de9aeee35c67b993ec9f6f8321391219995e2c2 (diff)
downloadupstream-2086f7284c63d759071729108e35687c4679b9fc.tar.gz
upstream-2086f7284c63d759071729108e35687c4679b9fc.tar.bz2
upstream-2086f7284c63d759071729108e35687c4679b9fc.zip
uclibc: fix _HAS_SSP replacement regex
A dot was dropped, making it match too much. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46116
-rw-r--r--toolchain/uClibc/common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index a4d29c93d5..53a844318b 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 && \