uclibc: never build with SSP

This doesn't work, as the initial gcc that is used for compiling
uclibc doesn't have support for SSP yet (since that will only
be available once uclibc has been compiled). Since during that
same compilation step uclibc is trying to build its own utils
those are failing to compile with SSP enabled as the
initial gcc doesn't have access to the required libraries,
yet.

We never used to set UCLIBC_BUILD_SSP in the past, this was
only changed as part of the upgrade to uclibc-ng in
commit 63bdadc (uclibc: Switch to using uclibc-ng), so here
we now simply restore the previous behaviour.

Note that we still enable SSP support inside uclibc for
everybody else to use, though.

Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc
index ed7b5222692daa183a78f01555e3e2ae14111995..8b9e41c64d2bdc72bda56bdf0ff0ebb614a692a5 100644 (file)
--- a/meta/recipes-core/uclibc/uclibc-config.inc
+++ b/meta/recipes-core/uclibc/uclibc-config.inc
@@ -119,7 +119,6 @@ def features_to_uclibc_settings(d):
     uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem)
     uclibc_cfg('xattr',     distro_features, 'UCLIBC_HAS_XATTR', cnf, rem)
     uclibc_cfg('ssp',       distro_features, 'UCLIBC_HAS_SSP', cnf, rem)
-    uclibc_cfg('ssp',       distro_features, 'UCLIBC_BUILD_SSP', cnf, rem)
     uclibc_cfg('argp',       distro_features, 'UCLIBC_HAS_ARGP', cnf, rem)
     uclibc_cfg('libc-posix-clang-wchar',  distro_features,'UCLIBC_HAS_WCHAR', cnf, rem)
     return "\n".join(cnf), "\n".join(rem)