summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-08 03:44:32 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-18 08:38:51 +0000
commit2e7dd298b17446708fa77a80e6ed2460ed98b059 (patch)
tree022b213dfe1d34bd8418d884155307922ff10feb
parent07f49c397864d34725d7ac3708b345934d5f0d49 (diff)
downloadpoky-2e7dd298b17446708fa77a80e6ed2460ed98b059.tar.gz
eglibc: Upgrade from 2.18 -> 2.19
License formatting and address for FSF in the COPYING and COPYING.LIB has changed. Dropped patched already upstream and patches that were workarounds for older glibc and busybox for e500 we have should pass --without-fp to eglibc/glibc 2.19 onwards the code is merged from eglibc into glibc upstream under nofpu/ pretext (From OE-Core rev: 875df27e56b82fcf970410b6d78e3672471c336a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-common.bbclass2
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native_2.19.bb (renamed from meta/recipes-core/eglibc/cross-localedef-native_2.18.bb)10
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.18/0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch43
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.18/make-4.patch31
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.18/tzselect-awk.patch42
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.18/tzselect-sh.patch156
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/0001-R_ARM_TLS_DTPOFF32.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/0001-eglibc-menuconfig-support.patch)122
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/0002-eglibc-menuconfig-hex-string-options.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/0003-eglibc-menuconfig-build-instructions.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/IO-acquire-lock-fix.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/add_resource_h_to_wait_h.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/eglibc-svn-arm-lowlevellock-include-tls.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/eglibc_fix_findidx_parameters.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf (renamed from meta/recipes-core/eglibc/eglibc-2.18/etc/ld.so.conf)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/fileops-without-wchar-io.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/fix-tibetian-locales.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/fix_for_centos_5.8.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/fsl-ppc-no-fsqrt.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/generate-supported.mk (renamed from meta/recipes-core/eglibc/eglibc-2.18/generate-supported.mk)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/glibc.fix_sqrt2.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/initgroups_keys.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/ld-search-order.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/mips-rld-map-check.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/multilib_readlib.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/ppc-sqrt_finite.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/ppc_slow_ieee754_sqrt.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/relocatable_sdk.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch (renamed from meta/recipes-core/eglibc/eglibc-2.18/relocatable_sdk_fix_openpath.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-initial_2.19.bb (renamed from meta/recipes-core/eglibc/eglibc-initial_2.18.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale_2.19.bb (renamed from meta/recipes-core/eglibc/eglibc-locale_2.18.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-mtrace_2.19.bb (renamed from meta/recipes-core/eglibc/eglibc-mtrace_2.18.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-scripts_2.19.bb (renamed from meta/recipes-core/eglibc/eglibc-scripts_2.18.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.19.bb (renamed from meta/recipes-core/eglibc/eglibc_2.18.bb)14
37 files changed, 73 insertions, 349 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 67b018b753..daf499d3eb 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -19,7 +19,7 @@ do_install() {
19} 19}
20 20
21def get_libc_fpu_setting(bb, d): 21def get_libc_fpu_setting(bb, d):
22 if d.getVar('TARGET_FPU', True) in [ 'soft' ]: 22 if d.getVar('TARGET_FPU', True) in [ 'soft', 'ppc-efd' ]:
23 return "--without-fp" 23 return "--without-fp"
24 return "" 24 return ""
25 25
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 1805da7b42..d6a626cfab 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -20,7 +20,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
20GCCVERSION ?= "4.8%" 20GCCVERSION ?= "4.8%"
21SDKGCCVERSION ?= "${GCCVERSION}" 21SDKGCCVERSION ?= "${GCCVERSION}"
22BINUVERSION ?= "2.24" 22BINUVERSION ?= "2.24"
23EGLIBCVERSION ?= "2.18" 23EGLIBCVERSION ?= "2.19"
24UCLIBCVERSION ?= "0.9.33+git%" 24UCLIBCVERSION ?= "0.9.33+git%"
25LINUXLIBCVERSION ?= "3.10" 25LINUXLIBCVERSION ?= "3.10"
26 26
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
index 4e7e947512..d3f43bd4d4 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPL-2.1"
5 5
6LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc" 6LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc"
7LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ 7LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
8 file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 8 file://${LIC_DIR}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 9 file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
10 file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 10 file://${LIC_DIR}/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
11 11
12 12
13inherit native 13inherit native
@@ -16,11 +16,11 @@ inherit autotools
16# pick up an eglibc patch 16# pick up an eglibc patch
17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" 17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
18 18
19SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \ 19SRC_URI = "http://sakrah.homelinux.org/files/eglibc-${PV}-svnr25243.tar.bz2 \
20 file://fix_for_centos_5.8.patch;patchdir=.. \ 20 file://fix_for_centos_5.8.patch;patchdir=.. \
21 " 21 "
22SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" 22SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
23SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" 23SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
24 24
25S = "${WORKDIR}/eglibc-${PV}/localedef" 25S = "${WORKDIR}/eglibc-${PV}/localedef"
26 26
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch
deleted file mode 100644
index 24d4772728..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.18/0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Backport
2
3From d0721e703d222c01a9e8c329311c4fb01dac6972 Mon Sep 17 00:00:00 2001
4From: Carlos O'Donell <carlos@redhat.com>
5Date: Thu, 29 Aug 2013 00:17:33 -0400
6Subject: [PATCH] ARM: Pass dl_hwcap to IFUNC resolver.
7
8For REL relocs pass dl_hwcap to the IFUNC resolver
9as is required by the IFUNC API (bug 15905).
10---
11 NEWS | 2 +-
12 ports/ChangeLog.arm | 7 +++++++
13 ports/sysdeps/arm/dl-machine.h | 2 +-
14 3 files changed, 9 insertions(+), 2 deletions(-)
15
16Index: libc/ports/ChangeLog.arm
17===================================================================
18--- libc.orig/ports/ChangeLog.arm 2013-07-14 16:08:52.000000000 -0700
19+++ libc/ports/ChangeLog.arm 2013-09-12 17:17:24.174387150 -0700
20@@ -1,3 +1,10 @@
21+2013-08-28 Kyle McMartin <kyle@redhat.com>
22+ Carlos O'Donell <carlos@redhat.com>
23+
24+ [BZ #15905]
25+ * sysdeps/arm/dl-machine [!RTLD_BOOTSTRAP] (elf_machine_rel):
26+ Pass GLRO(dl_hwcap) to the IFUNC resolver.
27+
28 2013-07-03 Joseph Myers <joseph@codesourcery.com>
29
30 * sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
31Index: libc/ports/sysdeps/arm/dl-machine.h
32===================================================================
33--- libc.orig/ports/sysdeps/arm/dl-machine.h 2013-09-12 08:56:03.641743520 -0700
34+++ libc/ports/sysdeps/arm/dl-machine.h 2013-09-12 17:17:24.174387150 -0700
35@@ -503,7 +503,7 @@
36 break;
37 case R_ARM_IRELATIVE:
38 value = map->l_addr + *reloc_addr;
39- value = ((Elf32_Addr (*) (void)) value) ();
40+ value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
41 *reloc_addr = value;
42 break;
43 #endif
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/make-4.patch b/meta/recipes-core/eglibc/eglibc-2.18/make-4.patch
deleted file mode 100644
index ec105b4ae2..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.18/make-4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Accept make versions 4.0 and greater
2
3Backport of glibc 28d708c44bc47b56f6551ff285f78edcf61c208a.
4
5Upstream-Status: Backport
6Signed-off-by: Jonathan Liu <net147@gmail.com>
7
8diff -Nur libc.orig/configure libc/configure
9--- libc.orig/configure 2013-08-21 02:23:48.000000000 +1000
10+++ libc/configure 2013-11-04 17:04:17.778333748 +1100
11@@ -4772,7 +4772,7 @@
12 ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
13 case $ac_prog_version in
14 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
15- 3.79* | 3.[89]*)
16+ 3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
17 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
18 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
19
20diff -Nur libc.orig/configure.in libc/configure.in
21--- libc.orig/configure.in 2013-08-21 02:23:48.000000000 +1000
22+++ libc/configure.in 2013-11-04 16:54:17.955014870 +1100
23@@ -989,7 +989,7 @@
24 critic_missing="$critic_missing gcc")
25 AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
26 [GNU Make[^0-9]*\([0-9][0-9.]*\)],
27- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
28+ [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
29
30 AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
31 [GNU gettext.* \([0-9]*\.[0-9.]*\)],
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/tzselect-awk.patch b/meta/recipes-core/eglibc/eglibc-2.18/tzselect-awk.patch
deleted file mode 100644
index dc9949bec9..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.18/tzselect-awk.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1tzselect: workaround bug in busybox awk
2
3busybox's version of awk in version 1.20.2 and lower doesn't support
4escape sequences in conjunction with the -F option. Use -v FS= instead
5as a workaround until the bug is fixed.
6
7Reference:
8https://bugs.busybox.net/show_bug.cgi?id=5126
9
10Upstream-Status: Inappropriate [other]
11
12Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
13
14--- libc/timezone/tzselect.ksh
15+++ libc/timezone/tzselect.ksh
16@@ -208,7 +208,7 @@ while
17 TZ_for_date=$TZ;;
18 *)
19 # Get list of names of countries in the continent or ocean.
20- countries=$($AWK -F'\t' \
21+ countries=$($AWK -v FS="\t" \
22 -v continent="$continent" \
23 -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
24 '
25@@ -252,7 +252,7 @@ while
26
27
28 # Get list of names of time zone rule regions in the country.
29- regions=$($AWK -F'\t' \
30+ regions=$($AWK -v FS="\t" \
31 -v country="$country" \
32 -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
33 '
34@@ -289,7 +289,7 @@ while
35 esac
36
37 # Determine TZ from country and region.
38- TZ=$($AWK -F'\t' \
39+ TZ=$($AWK -v FS="\t" \
40 -v country="$country" \
41 -v region="$region" \
42 -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/tzselect-sh.patch b/meta/recipes-core/eglibc/eglibc-2.18/tzselect-sh.patch
deleted file mode 100644
index e9a3691bbb..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.18/tzselect-sh.patch
+++ /dev/null
@@ -1,156 +0,0 @@
1tzselect: eliminate ksh-dependency
2
3This is an adapted version of a patch originally
4by Peter Seebach <peter.seebach@windriver.com> found here:
5http://www.eglibc.org/archives/patches/msg00671.html
6
7Upstream-Status: Pending
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10
11Index: libc/timezone/tzselect.ksh
12===================================================================
13--- libc.orig/timezone/tzselect.ksh 2012-11-17 09:50:14.000000000 -0800
14+++ libc/timezone/tzselect.ksh 2013-01-03 22:46:26.423844259 -0800
15@@ -1,4 +1,4 @@
16-#!/bin/bash
17+#!/bin/sh
18
19 PKGVERSION='(tzcode) '
20 TZVERSION=see_Makefile
21@@ -11,23 +11,80 @@
22
23 # Porting notes:
24 #
25-# This script requires a Posix-like shell with the extension of a
26-# 'select' statement. The 'select' statement was introduced in the
27-# Korn shell and is available in Bash and other shell implementations.
28-# If your host lacks both Bash and the Korn shell, you can get their
29-# source from one of these locations:
30+# func_select allows this script to run on shells (such as busybox ash)
31+# which lack the ksh "select" builtin.
32 #
33-# Bash <http://www.gnu.org/software/bash/bash.html>
34-# Korn Shell <http://www.kornshell.com/>
35-# Public Domain Korn Shell <http://www.cs.mun.ca/~michael/pdksh/>
36-#
37-# This script also uses several features of modern awk programs.
38+# This script uses several features of modern awk programs.
39 # If your host lacks awk, or has an old awk that does not conform to Posix,
40 # you can use either of the following free programs instead:
41 #
42 # Gawk (GNU awk) <http://www.gnu.org/software/gawk/>
43 # mawk <http://invisible-island.net/mawk/>
44
45+# Implement ksh-style select in POSIX shell
46+
47+# We need a mostly-portable echo-n.
48+case `echo -n "foo\c"` in
49+*n*c*) func_echo_n() { echo "$*"; } ;;
50+*n*) func_echo_n() { echo "$*\c"; } ;;
51+*) func_echo_n() { echo -n "$*"; } ;;
52+esac
53+
54+# Synopsis: Replace "select foo in list" with "while func_select foo in list"
55+# and this works just like ksh, so far as I know.
56+func_select () {
57+ func_select_args=0
58+ if expr "$1" : "[_a-zA-Z][_a-zA-Z0-9]*$" > /dev/null; then
59+ func_select_var=$1
60+ else
61+ echo >&2 "func_select: '$1' is not a valid variable name."
62+ return 1
63+ fi
64+ shift 1
65+ case $1 in
66+ in) shift 1;;
67+ *) echo >&2 "func_select: usage: func_select var in ... (you must provide
68+arguments)"; return 1;;
69+ esac
70+ case $# in
71+ 0) echo >&2 "func_select: usage: func_select var in ..."; return 1;;
72+ esac
73+ for func_select_arg
74+ do
75+ func_select_args=`expr $func_select_args + 1`
76+ eval func_select_a_$func_select_args=\$func_select_arg
77+ done
78+ REPLY=""
79+ while :
80+ do
81+ if test -z "$REPLY"; then
82+ func_select_i=1
83+ while test $func_select_i -le $func_select_args
84+ do
85+ eval echo "\"\$func_select_i) \$func_select_a_$func_select_i\""
86+ func_select_i=`expr $func_select_i + 1`
87+ done
88+ fi
89+ func_echo_n "${PS3-#? }" >&2
90+ if read REPLY; then
91+ if test -n "${REPLY}"; then
92+ if expr "$REPLY" : '[1-9][0-9]*$' > /dev/null; then
93+ if test "$REPLY" -ge 1 && test "$REPLY" -le $func_select_args; then
94+ eval $func_select_var=\$func_select_a_$REPLY
95+ else
96+ eval $func_select_var=
97+ fi
98+ else
99+ eval $func_select_var=
100+ fi
101+ return 0
102+ fi
103+ else
104+ eval $func_select_var=
105+ return 1
106+ fi
107+ done
108+}
109
110 # Specify default values for environment variables if they are unset.
111 : ${AWK=awk}
112@@ -72,7 +129,7 @@
113
114
115 # Work around a bug in bash 1.14.7 and earlier, where $PS3 is sent to stdout.
116-case $(echo 1 | (select x in x; do break; done) 2>/dev/null) in
117+case $(echo 1 | (while func_select x in x; do break; done) 2>/dev/null) in
118 ?*) PS3=
119 esac
120
121@@ -92,7 +149,7 @@
122
123 echo >&2 'Please select a continent or ocean.'
124
125- select continent in \
126+ while func_select continent in \
127 Africa \
128 Americas \
129 Antarctica \
130@@ -172,7 +229,7 @@
131 case $countries in
132 *"$newline"*)
133 echo >&2 'Please select a country.'
134- select country in $countries
135+ while func_select country in $countries
136 do
137 case $country in
138 '') echo >&2 'Please enter a number in range.';;
139@@ -211,7 +268,7 @@
140 *"$newline"*)
141 echo >&2 'Please select one of the following' \
142 'time zone regions.'
143- select region in $regions
144+ while func_select region in $regions
145 do
146 case $region in
147 '') echo >&2 'Please enter a number in range.';;
148@@ -288,7 +345,7 @@
149 echo >&2 "Is the above information OK?"
150
151 ok=
152- select ok in Yes No
153+ while func_select ok in Yes No
154 do
155 case $ok in
156 '') echo >&2 'Please enter 1 for Yes, or 2 for No.';;
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-R_ARM_TLS_DTPOFF32.patch b/meta/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch
index b4489e9ae9..b4489e9ae9 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/0001-R_ARM_TLS_DTPOFF32.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-eglibc-menuconfig-support.patch b/meta/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch
index 9e23e7cda2..4559a110fb 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/0001-eglibc-menuconfig-support.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch
@@ -57,9 +57,9 @@ Nucleus(r) | Linux(r) | Android(tm) | Services | UI | Multi-OS
57 57
58Index: libc/EGLIBC.cross-building 58Index: libc/EGLIBC.cross-building
59=================================================================== 59===================================================================
60--- libc.orig/EGLIBC.cross-building 2007-04-20 16:15:03.000000000 -0700 60--- libc.orig/EGLIBC.cross-building
61+++ libc/EGLIBC.cross-building 2013-06-26 00:45:15.788885570 -0700 61+++ libc/EGLIBC.cross-building
62@@ -243,9 +243,29 @@ 62@@ -243,9 +243,29 @@ full EGLIBC build:
63 > $src/libc/configure \ 63 > $src/libc/configure \
64 > --prefix=/usr \ 64 > --prefix=/usr \
65 > --with-headers=$sysroot/usr/include \ 65 > --with-headers=$sysroot/usr/include \
@@ -89,11 +89,11 @@ Index: libc/EGLIBC.cross-building
89 $ PATH=$tools/bin:$PATH make 89 $ PATH=$tools/bin:$PATH make
90 $ PATH=$tools/bin:$PATH make install install_root=$sysroot 90 $ PATH=$tools/bin:$PATH make install install_root=$sysroot
91 91
92Index: libc/configure.in 92Index: libc/configure.ac
93=================================================================== 93===================================================================
94--- libc.orig/configure.in 2013-06-24 15:42:26.000000000 -0700 94--- libc.orig/configure.ac
95+++ libc/configure.in 2013-06-26 00:45:15.792885570 -0700 95+++ libc/configure.ac
96@@ -127,6 +127,16 @@ 96@@ -127,6 +127,16 @@ AC_ARG_WITH([headers],
97 [sysheaders='']) 97 [sysheaders=''])
98 AC_SUBST(sysheaders) 98 AC_SUBST(sysheaders)
99 99
@@ -112,9 +112,9 @@ Index: libc/configure.in
112 AC_HELP_STRING([--with-default-link], 112 AC_HELP_STRING([--with-default-link],
113Index: libc/config.make.in 113Index: libc/config.make.in
114=================================================================== 114===================================================================
115--- libc.orig/config.make.in 2013-04-28 08:21:50.000000000 -0700 115--- libc.orig/config.make.in
116+++ libc/config.make.in 2013-06-26 00:45:15.792885570 -0700 116+++ libc/config.make.in
117@@ -45,6 +45,8 @@ 117@@ -45,6 +45,8 @@ sysincludes = @SYSINCLUDES@
118 c++-sysincludes = @CXX_SYSINCLUDES@ 118 c++-sysincludes = @CXX_SYSINCLUDES@
119 all-warnings = @all_warnings@ 119 all-warnings = @all_warnings@
120 120
@@ -125,8 +125,8 @@ Index: libc/config.make.in
125 have-Bgroup = @libc_cv_Bgroup@ 125 have-Bgroup = @libc_cv_Bgroup@
126Index: libc/options-config/config-postproc.pl 126Index: libc/options-config/config-postproc.pl
127=================================================================== 127===================================================================
128--- /dev/null 1970-01-01 00:00:00.000000000 +0000 128--- /dev/null
129+++ libc/options-config/config-postproc.pl 2013-06-26 00:45:15.792885570 -0700 129+++ libc/options-config/config-postproc.pl
130@@ -0,0 +1,54 @@ 130@@ -0,0 +1,54 @@
131+#!/usr/bin/perl 131+#!/usr/bin/perl
132+ 132+
@@ -184,8 +184,8 @@ Index: libc/options-config/config-postproc.pl
184+} 184+}
185Index: libc/options-config/config-preproc.pl 185Index: libc/options-config/config-preproc.pl
186=================================================================== 186===================================================================
187--- /dev/null 1970-01-01 00:00:00.000000000 +0000 187--- /dev/null
188+++ libc/options-config/config-preproc.pl 2013-06-26 00:45:15.792885570 -0700 188+++ libc/options-config/config-preproc.pl
189@@ -0,0 +1,8 @@ 189@@ -0,0 +1,8 @@
190+#!/usr/bin/perl 190+#!/usr/bin/perl
191+ 191+
@@ -197,8 +197,8 @@ Index: libc/options-config/config-preproc.pl
197+} 197+}
198Index: libc/options-config/Makefile 198Index: libc/options-config/Makefile
199=================================================================== 199===================================================================
200--- /dev/null 1970-01-01 00:00:00.000000000 +0000 200--- /dev/null
201+++ libc/options-config/Makefile 2013-06-26 00:45:15.792885570 -0700 201+++ libc/options-config/Makefile
202@@ -0,0 +1,55 @@ 202@@ -0,0 +1,55 @@
203+# =========================================================================== 203+# ===========================================================================
204+# EGLIBC option-groups configuration targets 204+# EGLIBC option-groups configuration targets
@@ -257,8 +257,8 @@ Index: libc/options-config/Makefile
257+endif 257+endif
258Index: libc/option-groups.def 258Index: libc/option-groups.def
259=================================================================== 259===================================================================
260--- libc.orig/option-groups.def 2013-05-17 17:12:09.000000000 -0700 260--- libc.orig/option-groups.def
261+++ libc/option-groups.def 2013-06-26 00:45:15.796885570 -0700 261+++ libc/option-groups.def
262@@ -4,19 +4,19 @@ 262@@ -4,19 +4,19 @@
263 # 263 #
264 # An entry of the form: 264 # An entry of the form:
@@ -294,7 +294,7 @@ Index: libc/option-groups.def
294 help 294 help
295 This option group includes the functions specified by RFC 3542, 295 This option group includes the functions specified by RFC 3542,
296 "Advanced Sockets Application Program Interface (API) for 296 "Advanced Sockets Application Program Interface (API) for
297@@ -71,7 +71,7 @@ 297@@ -71,7 +71,7 @@ config OPTION_EGLIBC_ADVANCED_INET6
298 inet6_rth_segments 298 inet6_rth_segments
299 inet6_rth_space 299 inet6_rth_space
300 300
@@ -303,7 +303,7 @@ Index: libc/option-groups.def
303 bool "Functions for producing backtraces" 303 bool "Functions for producing backtraces"
304 help 304 help
305 This option group includes functions for producing a list of 305 This option group includes functions for producing a list of
306@@ -85,7 +85,7 @@ 306@@ -85,7 +85,7 @@ config OPTION_EGLIBC_BACKTRACE
307 backtrace_symbols 307 backtrace_symbols
308 backtrace_symbols_fd 308 backtrace_symbols_fd
309 309
@@ -312,7 +312,7 @@ Index: libc/option-groups.def
312 bool "Use extensive inline code" 312 bool "Use extensive inline code"
313 help 313 help
314 This option group specifies whether certain pieces of code 314 This option group specifies whether certain pieces of code
315@@ -93,7 +93,7 @@ 315@@ -93,7 +93,7 @@ config OPTION_EGLIBC_BIG_MACROS
316 group is not selected, function calls will be used instead, 316 group is not selected, function calls will be used instead,
317 hence reducing the library footprint. 317 hence reducing the library footprint.
318 318
@@ -321,7 +321,7 @@ Index: libc/option-groups.def
321 bool "BSD-specific functions, and their compatibility stubs" 321 bool "BSD-specific functions, and their compatibility stubs"
322 help 322 help
323 This option group includes functions specific to BSD kernels. 323 This option group includes functions specific to BSD kernels.
324@@ -109,10 +109,9 @@ 324@@ -109,10 +109,9 @@ config OPTION_EGLIBC_BSD
325 revoke 325 revoke
326 setlogin 326 setlogin
327 327
@@ -334,7 +334,7 @@ Index: libc/option-groups.def
334 help 334 help
335 This option group does not include any C library functions; 335 This option group does not include any C library functions;
336 instead, it controls which EGLIBC tests an ordinary 'make 336 instead, it controls which EGLIBC tests an ordinary 'make
337@@ -121,23 +120,22 @@ 337@@ -121,23 +120,22 @@ config OPTION_EGLIBC_CXX_TESTS
338 run. 338 run.
339 339
340 The standard C++ library depends on the math library 'libm' and 340 The standard C++ library depends on the math library 'libm' and
@@ -365,7 +365,7 @@ Index: libc/option-groups.def
365 This option group includes support for character sets other 365 This option group includes support for character sets other
366 than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their 366 than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their
367 various encodings. This affects both the character sets 367 various encodings. This affects both the character sets
368@@ -198,16 +196,16 @@ 368@@ -198,16 +196,16 @@ config OPTION_EGLIBC_CHARSETS
369 WCHAR_T - EGLIBC's internal form (target-endian, 369 WCHAR_T - EGLIBC's internal form (target-endian,
370 32-bit ISO 10646) 370 32-bit ISO 10646)
371 371
@@ -385,7 +385,7 @@ Index: libc/option-groups.def
385 help 385 help
386 This option group provides ultra fast DES-based implementation of 386 This option group provides ultra fast DES-based implementation of
387 the `crypt' function. When this option group is disabled, 387 the `crypt' function. When this option group is disabled,
388@@ -216,7 +214,7 @@ 388@@ -216,7 +214,7 @@ config OPTION_EGLIBC_CRYPT_UFC
389 errno to ENOSYS if /salt/ passed does not correspond to either MD5, 389 errno to ENOSYS if /salt/ passed does not correspond to either MD5,
390 SHA-256 or SHA-512 algorithm. 390 SHA-256 or SHA-512 algorithm.
391 391
@@ -394,7 +394,7 @@ Index: libc/option-groups.def
394 bool "Functions for accessing the mail aliases database" 394 bool "Functions for accessing the mail aliases database"
395 help 395 help
396 This option group includues functions for looking up mail 396 This option group includues functions for looking up mail
397@@ -233,7 +231,7 @@ 397@@ -233,7 +231,7 @@ config OPTION_EGLIBC_DB_ALIASES
398 When this option group is disabled, the NSS service libraries 398 When this option group is disabled, the NSS service libraries
399 also lack support for querying their mail alias tables. 399 also lack support for querying their mail alias tables.
400 400
@@ -403,7 +403,7 @@ Index: libc/option-groups.def
403 bool "Functions for handling envz-style environment vectors." 403 bool "Functions for handling envz-style environment vectors."
404 help 404 help
405 This option group contains functions for creating and operating 405 This option group contains functions for creating and operating
406@@ -248,7 +246,7 @@ 406@@ -248,7 +246,7 @@ config OPTION_EGLIBC_ENVZ
407 envz_entry envz_remove 407 envz_entry envz_remove
408 envz_get envz_strip 408 envz_get envz_strip
409 409
@@ -412,7 +412,7 @@ Index: libc/option-groups.def
412 bool "Functions for converting floating-point numbers to strings" 412 bool "Functions for converting floating-point numbers to strings"
413 help 413 help
414 This option group includes functions for converting 414 This option group includes functions for converting
415@@ -262,14 +260,14 @@ 415@@ -262,14 +260,14 @@ config OPTION_EGLIBC_FCVT
416 fcvt_r qfcvt_r 416 fcvt_r qfcvt_r
417 gcvt qgcvt 417 gcvt qgcvt
418 418
@@ -429,7 +429,7 @@ Index: libc/option-groups.def
429 bool "Access functions for 'fstab'" 429 bool "Access functions for 'fstab'"
430 help 430 help
431 This option group includes functions for reading the mount 431 This option group includes functions for reading the mount
432@@ -283,7 +281,7 @@ 432@@ -283,7 +281,7 @@ config OPTION_EGLIBC_FSTAB
433 getfsent setfsent 433 getfsent setfsent
434 getfsfile 434 getfsfile
435 435
@@ -438,7 +438,7 @@ Index: libc/option-groups.def
438 bool "Functions for traversing file hierarchies" 438 bool "Functions for traversing file hierarchies"
439 help 439 help
440 This option group includes functions for traversing file 440 This option group includes functions for traversing file
441@@ -297,9 +295,9 @@ 441@@ -297,9 +295,9 @@ config OPTION_EGLIBC_FTRAVERSE
442 fts_set nftw64 442 fts_set nftw64
443 fts_close 443 fts_close
444 444
@@ -450,7 +450,7 @@ Index: libc/option-groups.def
450 help 450 help
451 This function group includes the 'getlogin' and 'getlogin_r' 451 This function group includes the 'getlogin' and 'getlogin_r'
452 functions, which return the user name associated by the login 452 functions, which return the user name associated by the login
453@@ -309,17 +307,17 @@ 453@@ -309,17 +307,17 @@ config OPTION_EGLIBC_GETLOGIN
454 fall back on 'getlogin' to find the user's login name for tilde 454 fall back on 'getlogin' to find the user's login name for tilde
455 expansion when the 'HOME' environment variable is not set. 455 expansion when the 'HOME' environment variable is not set.
456 456
@@ -471,7 +471,7 @@ Index: libc/option-groups.def
471 installation and API changes as follows: 471 installation and API changes as follows:
472 472
473 - The following libraries are not installed: 473 - The following libraries are not installed:
474@@ -439,14 +437,14 @@ 474@@ -439,14 +437,14 @@ config OPTION_EGLIBC_INET
475 use Unix-domain sockets to communicate with the syslog daemon; 475 use Unix-domain sockets to communicate with the syslog daemon;
476 syslog is valuable in non-networked contexts. 476 syslog is valuable in non-networked contexts.
477 477
@@ -489,7 +489,7 @@ Index: libc/option-groups.def
489 bool "libm (math library)" 489 bool "libm (math library)"
490 help 490 help
491 This option group includes the 'libm' library, containing 491 This option group includes the 'libm' library, containing
492@@ -464,7 +462,7 @@ 492@@ -464,7 +462,7 @@ config OPTION_EGLIBC_LIBM
493 group, you will not be able to build 'libstdc++' against the 493 group, you will not be able to build 'libstdc++' against the
494 resulting EGLIBC installation. 494 resulting EGLIBC installation.
495 495
@@ -498,7 +498,7 @@ Index: libc/option-groups.def
498 bool "Locale definitions" 498 bool "Locale definitions"
499 help 499 help
500 This option group includes all locale definitions other than 500 This option group includes all locale definitions other than
501@@ -472,17 +470,17 @@ 501@@ -472,17 +470,17 @@ config OPTION_EGLIBC_LOCALES
502 only the "C" locale is supported. 502 only the "C" locale is supported.
503 503
504 504
@@ -520,7 +520,7 @@ Index: libc/option-groups.def
520 functions are omitted from libc: 520 functions are omitted from libc:
521 521
522 duplocale localeconv nl_langinfo rpmatch strfmon_l 522 duplocale localeconv nl_langinfo rpmatch strfmon_l
523@@ -491,46 +489,43 @@ 523@@ -491,46 +489,43 @@ config OPTION_EGLIBC_LOCALE_CODE
524 Furthermore, only the LC_CTYPE and LC_TIME categories of the 524 Furthermore, only the LC_CTYPE and LC_TIME categories of the
525 standard "C" locale are available. 525 standard "C" locale are available.
526 526
@@ -576,7 +576,7 @@ Index: libc/option-groups.def
576 This option group includes support for the 'nsswitch' facility. 576 This option group includes support for the 'nsswitch' facility.
577 With this option group enabled, all EGLIBC functions for 577 With this option group enabled, all EGLIBC functions for
578 accessing various system databases (passwords and groups; 578 accessing various system databases (passwords and groups;
579@@ -544,12 +539,12 @@ 579@@ -544,12 +539,12 @@ config OPTION_EGLIBC_NSSWITCH
580 'option-groups.config' file must set the following two 580 'option-groups.config' file must set the following two
581 variables: 581 variables:
582 582
@@ -591,7 +591,7 @@ Index: libc/option-groups.def
591 produces a C library that uses the nsswitch service 591 produces a C library that uses the nsswitch service
592 libraries to search for database entries as this file 592 libraries to search for database entries as this file
593 specifies, instead of consulting '/etc/nsswitch.conf' at run 593 specifies, instead of consulting '/etc/nsswitch.conf' at run
594@@ -567,7 +562,7 @@ 594@@ -567,7 +562,7 @@ config OPTION_EGLIBC_NSSWITCH
595 you will probably want to delete references to databases not 595 you will probably want to delete references to databases not
596 needed on your system. 596 needed on your system.
597 597
@@ -600,7 +600,7 @@ Index: libc/option-groups.def
600 600
601 The EGLIBC build process uses this file to decide which 601 The EGLIBC build process uses this file to decide which
602 functions to make available from which service libraries. 602 functions to make available from which service libraries.
603@@ -585,28 +580,28 @@ 603@@ -585,28 +580,28 @@ config OPTION_EGLIBC_NSSWITCH
604 Be sure to mention each function in each service you wish to 604 Be sure to mention each function in each service you wish to
605 use. If you do not mention a service's function here, the 605 use. If you do not mention a service's function here, the
606 EGLIBC database access functions will not find it, even if 606 EGLIBC database access functions will not find it, even if
@@ -647,7 +647,7 @@ Index: libc/option-groups.def
647 help 647 help
648 This option group includes functions for running commands on 648 This option group includes functions for running commands on
649 remote machines via the 'rsh' protocol, and doing authentication 649 remote machines via the 'rsh' protocol, and doing authentication
650@@ -622,7 +617,7 @@ 650@@ -622,7 +617,7 @@ config OPTION_EGLIBC_RCMD
651 rresvport ruserpass 651 rresvport ruserpass
652 rresvport_af 652 rresvport_af
653 653
@@ -656,7 +656,7 @@ Index: libc/option-groups.def
656 bool "Runtime linker debug print outs" 656 bool "Runtime linker debug print outs"
657 help 657 help
658 This option group enables debug output of the runtime linker 658 This option group enables debug output of the runtime linker
659@@ -633,7 +628,7 @@ 659@@ -633,7 +628,7 @@ config OPTION_EGLIBC_RTLD_DEBUG
660 the `ldd' utility which may also be used by the prelinker. 660 the `ldd' utility which may also be used by the prelinker.
661 In particular, the `--unused' ldd option will not work correctly. 661 In particular, the `--unused' ldd option will not work correctly.
662 662
@@ -665,7 +665,7 @@ Index: libc/option-groups.def
665 bool "Support for POSIX posix_spawn functions" 665 bool "Support for POSIX posix_spawn functions"
666 help 666 help
667 This option group includes the POSIX functions for executing 667 This option group includes the POSIX functions for executing
668@@ -669,7 +664,7 @@ 668@@ -669,7 +664,7 @@ config OPTION_EGLIBC_SPAWN
669 disabled, those programs will only operate on uncompressed 669 disabled, those programs will only operate on uncompressed
670 charmap files. 670 charmap files.
671 671
@@ -674,7 +674,7 @@ Index: libc/option-groups.def
674 bool "Support for accessing STREAMS." 674 bool "Support for accessing STREAMS."
675 help 675 help
676 This option group includes functions for reading and writing 676 This option group includes functions for reading and writing
677@@ -685,14 +680,14 @@ 677@@ -685,14 +680,14 @@ config OPTION_EGLIBC_STREAMS
678 isastream fdetach 678 isastream fdetach
679 putmsg 679 putmsg
680 680
@@ -692,7 +692,7 @@ Index: libc/option-groups.def
692 bool "Older access functions for 'utmp' login records" 692 bool "Older access functions for 'utmp' login records"
693 help 693 help
694 This option group includes the older 'utent' family of 694 This option group includes the older 'utent' family of
695@@ -719,9 +714,9 @@ 695@@ -719,9 +714,9 @@ config OPTION_EGLIBC_UTMP
696 696
697 libutil.so (and libutil.a) 697 libutil.so (and libutil.a)
698 698
@@ -704,7 +704,7 @@ Index: libc/option-groups.def
704 help 704 help
705 This option group includes the POSIX functions for reading and 705 This option group includes the POSIX functions for reading and
706 writing user login records in the 'utmp' file (usually 706 writing user login records in the 'utmp' file (usually
707@@ -742,21 +737,21 @@ 707@@ -742,21 +737,21 @@ config OPTION_EGLIBC_UTMPX
708 updwtmpx 708 updwtmpx
709 utmpxname 709 utmpxname
710 710
@@ -729,7 +729,7 @@ Index: libc/option-groups.def
729 729
730 This option group includes the following functions: 730 This option group includes the following functions:
731 731
732@@ -778,14 +773,14 @@ 732@@ -778,14 +773,14 @@ config OPTION_POSIX_C_LANG_WIDE_CHAR
733 mbrlen wcscoll wcstol 733 mbrlen wcscoll wcstol
734 mbrtowc wcscpy wcstold 734 mbrtowc wcscpy wcstold
735 735
@@ -746,7 +746,7 @@ Index: libc/option-groups.def
746 omitted from libc: 746 omitted from libc:
747 747
748 re_comp re_max_failures regcomp 748 re_comp re_max_failures regcomp
749@@ -799,9 +794,9 @@ 749@@ -799,9 +794,9 @@ config OPTION_POSIX_REGEXP
750 <regexp.h> header file, 'compile', 'step', and 'advance', is 750 <regexp.h> header file, 'compile', 'step', and 'advance', is
751 omitted. 751 omitted.
752 752
@@ -758,7 +758,7 @@ Index: libc/option-groups.def
758 help 758 help
759 This option group specifies which regular expression 759 This option group specifies which regular expression
760 library to use. The choice is between regex 760 library to use. The choice is between regex
761@@ -810,9 +805,9 @@ 761@@ -810,9 +805,9 @@ config OPTION_POSIX_REGEXP_GLIBC
762 optimized for speed; regex from libiberty is more than twice 762 optimized for speed; regex from libiberty is more than twice
763 as small while still is enough for most practical purposes. 763 as small while still is enough for most practical purposes.
764 764
@@ -772,9 +772,9 @@ Index: libc/option-groups.def
772 wide characters to and from <stdio.h> streams. 772 wide characters to and from <stdio.h> streams.
773Index: libc/Makefile 773Index: libc/Makefile
774=================================================================== 774===================================================================
775--- libc.orig/Makefile 2013-06-04 08:48:26.000000000 -0700 775--- libc.orig/Makefile
776+++ libc/Makefile 2013-06-26 00:45:15.796885570 -0700 776+++ libc/Makefile
777@@ -24,6 +24,7 @@ 777@@ -24,6 +24,7 @@ endif
778 778
779 include Makeconfig 779 include Makeconfig
780 780
@@ -784,9 +784,9 @@ Index: libc/Makefile
784 .PHONY: all 784 .PHONY: all
785Index: libc/configure 785Index: libc/configure
786=================================================================== 786===================================================================
787--- libc.orig/configure 2013-06-24 15:42:26.000000000 -0700 787--- libc.orig/configure
788+++ libc/configure 2013-06-26 00:45:15.800885570 -0700 788+++ libc/configure
789@@ -622,6 +622,7 @@ 789@@ -621,6 +621,7 @@ KSH
790 libc_cv_have_bash2 790 libc_cv_have_bash2
791 BASH_SHELL 791 BASH_SHELL
792 libc_cv_gcc_static_libgcc 792 libc_cv_gcc_static_libgcc
@@ -794,7 +794,7 @@ Index: libc/configure
794 CXX_SYSINCLUDES 794 CXX_SYSINCLUDES
795 SYSINCLUDES 795 SYSINCLUDES
796 AUTOCONF 796 AUTOCONF
797@@ -734,6 +735,7 @@ 797@@ -734,6 +735,7 @@ with_fp
798 with_binutils 798 with_binutils
799 with_selinux 799 with_selinux
800 with_headers 800 with_headers
@@ -802,7 +802,7 @@ Index: libc/configure
802 with_default_link 802 with_default_link
803 enable_sanity_checks 803 enable_sanity_checks
804 enable_shared 804 enable_shared
805@@ -1432,6 +1434,9 @@ 805@@ -1438,6 +1440,9 @@ Optional Packages:
806 --with-selinux if building with SELinux support 806 --with-selinux if building with SELinux support
807 --with-headers=PATH location of system headers to use (for example 807 --with-headers=PATH location of system headers to use (for example
808 /usr/src/linux/include) [default=compiler default] 808 /usr/src/linux/include) [default=compiler default]
@@ -812,7 +812,7 @@ Index: libc/configure
812 --with-default-link do not use explicit linker scripts 812 --with-default-link do not use explicit linker scripts
813 --with-cpu=CPU select code for CPU variant 813 --with-cpu=CPU select code for CPU variant
814 814
815@@ -3395,6 +3400,14 @@ 815@@ -3401,6 +3406,14 @@ fi
816 816
817 817
818 818
@@ -829,9 +829,9 @@ Index: libc/configure
829 if test "${with_default_link+set}" = set; then : 829 if test "${with_default_link+set}" = set; then :
830Index: libc/EGLIBC.option-groups 830Index: libc/EGLIBC.option-groups
831=================================================================== 831===================================================================
832--- libc.orig/EGLIBC.option-groups 2007-04-13 17:50:17.000000000 -0700 832--- libc.orig/EGLIBC.option-groups
833+++ libc/EGLIBC.option-groups 2013-06-26 00:45:15.800885570 -0700 833+++ libc/EGLIBC.option-groups
834@@ -56,33 +56,9 @@ 834@@ -56,33 +56,9 @@ disable option groups one by one, until
835 835
836 The Option Groups 836 The Option Groups
837 837
@@ -868,7 +868,7 @@ Index: libc/EGLIBC.option-groups
868 868
869 The POSIX.1-2001 specification includes a suggested partition of all 869 The POSIX.1-2001 specification includes a suggested partition of all
870 the functions in the POSIX C API into option groups: math functions 870 the functions in the POSIX C API into option groups: math functions
871@@ -110,6 +86,18 @@ 871@@ -110,6 +86,18 @@ data, but include mathematical functions
872 OPTION_EGLIBC_LOCALES = n 872 OPTION_EGLIBC_LOCALES = n
873 OPTION_EGLIBC_LIBM = y 873 OPTION_EGLIBC_LIBM = y
874 874
@@ -887,7 +887,7 @@ Index: libc/EGLIBC.option-groups
887 In general, each option group variable controls whether a given set of 887 In general, each option group variable controls whether a given set of
888 object files in EGLIBC is compiled and included in the final 888 object files in EGLIBC is compiled and included in the final
889 libraries, or omitted from the build. 889 libraries, or omitted from the build.
890@@ -132,22 +120,3 @@ 890@@ -132,22 +120,3 @@ under development.
891 891
892 We have used the system to subset some portions of EGLIBC's 892 We have used the system to subset some portions of EGLIBC's
893 functionality. It needs to be extended to cover more of the library. 893 functionality. It needs to be extended to cover more of the library.
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index a8463ea915..a8463ea915 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0002-eglibc-menuconfig-hex-string-options.patch b/meta/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch
index 7caba48112..7caba48112 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/0002-eglibc-menuconfig-hex-string-options.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0003-eglibc-menuconfig-build-instructions.patch b/meta/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch
index d137f5b318..d137f5b318 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/0003-eglibc-menuconfig-build-instructions.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch b/meta/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch
index 7258c82418..7258c82418 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/GLRO_dl_debug_mask.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch
index cf5803585c..cf5803585c 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/IO-acquire-lock-fix.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/add_resource_h_to_wait_h.patch b/meta/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch
index f5023c08d4..f5023c08d4 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/add_resource_h_to_wait_h.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch
index 4313aa5197..4313aa5197 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/eglibc-svn-arm-lowlevellock-include-tls.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/eglibc_fix_findidx_parameters.patch b/meta/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch
index bbf4605505..bbf4605505 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/eglibc_fix_findidx_parameters.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf
index e69de29bb2..e69de29bb2 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/etc/ld.so.conf
+++ b/meta/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/fileops-without-wchar-io.patch b/meta/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch
index 2ca0bca248..2ca0bca248 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/fileops-without-wchar-io.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/fix-tibetian-locales.patch b/meta/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch
index 25c43a9fe6..25c43a9fe6 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/fix-tibetian-locales.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/fix_for_centos_5.8.patch b/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
index 7618c99534..7618c99534 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/fix_for_centos_5.8.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/fsl-ppc-no-fsqrt.patch b/meta/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch
index 511ee9d19e..511ee9d19e 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/fsl-ppc-no-fsqrt.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.19/generate-supported.mk
index d2a28c2dc6..d2a28c2dc6 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/generate-supported.mk
+++ b/meta/recipes-core/eglibc/eglibc-2.19/generate-supported.mk
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/glibc.fix_sqrt2.patch b/meta/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch
index a66972998c..a66972998c 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/glibc.fix_sqrt2.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/initgroups_keys.patch b/meta/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch
index be29856b03..be29856b03 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/initgroups_keys.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch
index e83a0ad6d2..e83a0ad6d2 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/ld-search-order.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch
index 9b646fea95..9b646fea95 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/mips-rld-map-check.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/multilib_readlib.patch b/meta/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch
index 1542b1b519..1542b1b519 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/multilib_readlib.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/ppc-sqrt_finite.patch b/meta/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch
index 6ea666b1d6..6ea666b1d6 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/ppc-sqrt_finite.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/ppc_slow_ieee754_sqrt.patch b/meta/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch
index 60532cbd03..60532cbd03 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/ppc_slow_ieee754_sqrt.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/relocatable_sdk.patch b/meta/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch
index ca5f17ba58..ca5f17ba58 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/relocatable_sdk.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/relocatable_sdk_fix_openpath.patch b/meta/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch
index f164f8f9ae..f164f8f9ae 100644
--- a/meta/recipes-core/eglibc/eglibc-2.18/relocatable_sdk_fix_openpath.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.18.bb b/meta/recipes-core/eglibc/eglibc-initial_2.19.bb
index de45079603..de45079603 100644
--- a/meta/recipes-core/eglibc/eglibc-initial_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc-initial_2.19.bb
diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.18.bb b/meta/recipes-core/eglibc/eglibc-locale_2.19.bb
index ce6c1d2320..ce6c1d2320 100644
--- a/meta/recipes-core/eglibc/eglibc-locale_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc-locale_2.19.bb
diff --git a/meta/recipes-core/eglibc/eglibc-mtrace_2.18.bb b/meta/recipes-core/eglibc/eglibc-mtrace_2.19.bb
index 6fa2be9cc9..6fa2be9cc9 100644
--- a/meta/recipes-core/eglibc/eglibc-mtrace_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc-mtrace_2.19.bb
diff --git a/meta/recipes-core/eglibc/eglibc-scripts_2.18.bb b/meta/recipes-core/eglibc/eglibc-scripts_2.19.bb
index 31133621d1..31133621d1 100644
--- a/meta/recipes-core/eglibc/eglibc-scripts_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc-scripts_2.19.bb
diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 15e5eed3ff..7e582b6308 100644
--- a/meta/recipes-core/eglibc/eglibc_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -2,7 +2,7 @@ require eglibc.inc
2 2
3DEPENDS += "gperf-native kconfig-frontends-native" 3DEPENDS += "gperf-native kconfig-frontends-native"
4 4
5SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \ 5SRC_URI = "http://sakrah.homelinux.org/files/eglibc-${PV}-svnr25243.tar.bz2 \
6 file://eglibc-svn-arm-lowlevellock-include-tls.patch \ 6 file://eglibc-svn-arm-lowlevellock-include-tls.patch \
7 file://IO-acquire-lock-fix.patch \ 7 file://IO-acquire-lock-fix.patch \
8 file://mips-rld-map-check.patch \ 8 file://mips-rld-map-check.patch \
@@ -22,20 +22,16 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23
22 file://0003-eglibc-menuconfig-build-instructions.patch \ 22 file://0003-eglibc-menuconfig-build-instructions.patch \
23 file://fsl-ppc-no-fsqrt.patch \ 23 file://fsl-ppc-no-fsqrt.patch \
24 file://0001-R_ARM_TLS_DTPOFF32.patch \ 24 file://0001-R_ARM_TLS_DTPOFF32.patch \
25 file://tzselect-sh.patch \
26 file://tzselect-awk.patch \
27 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ 25 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
28 file://fix-tibetian-locales.patch \ 26 file://fix-tibetian-locales.patch \
29 file://0001-ARM-Pass-dl_hwcap-to-IFUNC-resolver.patch \
30 file://make-4.patch \
31 " 27 "
32SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" 28SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
33SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" 29SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
34 30
35LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ 31LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
36 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 32 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
37 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 33 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
38 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 34 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
39 35
40SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \ 36SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \
41 file://relocatable_sdk.patch \ 37 file://relocatable_sdk.patch \