diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-01-02 21:37:22 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-21 09:32:01 +0000 |
| commit | 9c3d461c4d54d684b38ec4c038a1c3c2fb9923f0 (patch) | |
| tree | d4974d75c8003d3b5bd2ee5093662b00ed682975 /meta/recipes-core/glibc/glibc.inc | |
| parent | 6eb64cdd5296c42a46f3485bca403814eec55b2c (diff) | |
| download | openembedded-core-contrib-9c3d461c4d54d684b38ec4c038a1c3c2fb9923f0.tar.gz | |
glibc: Upgrade to 2.23
Drop kconfig and options-group support
Forward port cross-localedef support
Assume ssp support in libc when building gcc-initial
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-core/glibc/glibc.inc')
| -rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 7c4551a4aa..5711209c71 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -44,12 +44,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" inherit autotools texinfo distro_features_check systemd -require glibc-options.inc - -# The main purpose of setting this variable is to prevent users from accidently -# overriding DISTRO_FEATRUES, causing obscure build failures because of lack -# of libc functions. -REQUIRED_DISTRO_FEATURES = "${DISTRO_FEATURES_LIBC}" LEAD_SONAME = "libc.so" @@ -58,6 +52,7 @@ CACHED_CONFIGUREVARS += " \ libc_cv_slibdir=${base_libdir} \ libc_cv_rootsbindir=${base_sbindir} \ libc_cv_localedir=${localedir} \ + libc_cv_ssp_strong=no \ libc_cv_ssp=no \ " @@ -82,18 +77,8 @@ PARALLEL_MAKE = "" # ensure make uses /bin/bash EXTRA_OEMAKE += "SHELL=/bin/bash" -OE_FEATURES = "${@features_to_glibc_settings(d)}" do_configure_prepend() { sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in - echo '${OE_FEATURES}' > ${B}/option-groups.config -} - -do_configure_append() { - yes '' | oe_runmake config - - # Remove quotation marks from OPTION_EGLIBC_NSSWITCH_FIXED_*. This will - # avoid install error. - sed -i 's/^OPTION_EGLIBC_NSSWITCH_FIXED_\(.*\)="\(.*\)"$/OPTION_EGLIBC_NSSWITCH_FIXED_\1=\2/' option-groups.config } GLIBC_ADDONS ?= "nptl,libidn" |