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:43 +0000 |
commit | 91a1baaf57153a86b7e14318c9d36e1cc38e3077 (patch) | |
tree | 51bb1d2724bbc5d3b98d9412de9cab8fb7b02524 /meta/recipes-core/glibc/glibc.inc | |
parent | c1f9507c69cac8cc28fec837a4bbb070c52a8a39 (diff) | |
download | poky-91a1baaf57153a86b7e14318c9d36e1cc38e3077.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
(From OE-Core rev: 9c3d461c4d54d684b38ec4c038a1c3c2fb9923f0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | |||
44 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" | 44 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" |
45 | PROVIDES += "virtual/libintl virtual/libiconv" | 45 | PROVIDES += "virtual/libintl virtual/libiconv" |
46 | inherit autotools texinfo distro_features_check systemd | 46 | inherit autotools texinfo distro_features_check systemd |
47 | require glibc-options.inc | ||
48 | |||
49 | # The main purpose of setting this variable is to prevent users from accidently | ||
50 | # overriding DISTRO_FEATRUES, causing obscure build failures because of lack | ||
51 | # of libc functions. | ||
52 | REQUIRED_DISTRO_FEATURES = "${DISTRO_FEATURES_LIBC}" | ||
53 | 47 | ||
54 | LEAD_SONAME = "libc.so" | 48 | LEAD_SONAME = "libc.so" |
55 | 49 | ||
@@ -58,6 +52,7 @@ CACHED_CONFIGUREVARS += " \ | |||
58 | libc_cv_slibdir=${base_libdir} \ | 52 | libc_cv_slibdir=${base_libdir} \ |
59 | libc_cv_rootsbindir=${base_sbindir} \ | 53 | libc_cv_rootsbindir=${base_sbindir} \ |
60 | libc_cv_localedir=${localedir} \ | 54 | libc_cv_localedir=${localedir} \ |
55 | libc_cv_ssp_strong=no \ | ||
61 | libc_cv_ssp=no \ | 56 | libc_cv_ssp=no \ |
62 | " | 57 | " |
63 | 58 | ||
@@ -82,18 +77,8 @@ PARALLEL_MAKE = "" | |||
82 | # ensure make uses /bin/bash | 77 | # ensure make uses /bin/bash |
83 | EXTRA_OEMAKE += "SHELL=/bin/bash" | 78 | EXTRA_OEMAKE += "SHELL=/bin/bash" |
84 | 79 | ||
85 | OE_FEATURES = "${@features_to_glibc_settings(d)}" | ||
86 | do_configure_prepend() { | 80 | do_configure_prepend() { |
87 | sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in | 81 | sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in |
88 | echo '${OE_FEATURES}' > ${B}/option-groups.config | ||
89 | } | ||
90 | |||
91 | do_configure_append() { | ||
92 | yes '' | oe_runmake config | ||
93 | |||
94 | # Remove quotation marks from OPTION_EGLIBC_NSSWITCH_FIXED_*. This will | ||
95 | # avoid install error. | ||
96 | sed -i 's/^OPTION_EGLIBC_NSSWITCH_FIXED_\(.*\)="\(.*\)"$/OPTION_EGLIBC_NSSWITCH_FIXED_\1=\2/' option-groups.config | ||
97 | } | 82 | } |
98 | 83 | ||
99 | GLIBC_ADDONS ?= "nptl,libidn" | 84 | GLIBC_ADDONS ?= "nptl,libidn" |