summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch32
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc13
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.19.bb3
4 files changed, 42 insertions, 8 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch b/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
new file mode 100644
index 0000000000..ac1e2e82f9
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
@@ -0,0 +1,32 @@
1sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir
2
3Upstream-Status:Pending
4Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
5
6diff --git a/libc/sysdeps/gnu/configure b/libc/sysdeps/gnu/configure
7index e7f0e43..687beab 100644
8--- a/libc/sysdeps/gnu/configure
9+++ b/libc/sysdeps/gnu/configure
10@@ -42,6 +42,6 @@ case "$prefix" in
11 else
12 libc_cv_localstatedir=$localstatedir
13 fi
14- libc_cv_rootsbindir=/sbin
15+ test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
16 ;;
17 esac
18diff --git a/libc/sysdeps/gnu/configure.ac b/libc/sysdeps/gnu/configure.ac
19index ce251df..57c1e77 100644
20--- a/libc/sysdeps/gnu/configure.ac
21+++ b/libc/sysdeps/gnu/configure.ac
22@@ -42,6 +42,6 @@ case "$prefix" in
23 else
24 libc_cv_localstatedir=$localstatedir
25 fi
26- libc_cv_rootsbindir=/sbin
27+ test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
28 ;;
29 esac
30--
312.0.0
32
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 6721819d2e..d5d407f5e7 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -39,7 +39,7 @@ FILES_libsegfault = "${base_libdir}/libSegFault*"
39FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" 39FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
40FILES_libmemusage = "${base_libdir}/libmemusage.so" 40FILES_libmemusage = "${base_libdir}/libmemusage.so"
41FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" 41FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
42FILES_sln = "/sbin/sln" 42FILES_sln = "${base_sbindir}/sln"
43FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" 43FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
44FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" 44FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
45FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" 45FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 3a623bb8c7..68128e9755 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -43,11 +43,14 @@ require eglibc-options.inc
43 43
44LEAD_SONAME = "libc.so" 44LEAD_SONAME = "libc.so"
45 45
46CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \ 46CACHED_CONFIGUREVARS += " \
47 ac_cv_path_BASH_SHELL=${base_bindir}/bash \ 47 ac_cv_path_KSH=${base_bindir}/bash \
48 libc_cv_localedir=${localedir} \ 48 ac_cv_path_BASH_SHELL=${base_bindir}/bash \
49 libc_cv_ssp=no \ 49 libc_cv_slibdir=${base_libdir} \
50 " 50 libc_cv_rootsbindir=${base_sbindir} \
51 libc_cv_localedir=${localedir} \
52 libc_cv_ssp=no \
53"
51 54
52GLIBC_EXTRA_OECONF ?= "" 55GLIBC_EXTRA_OECONF ?= ""
53GLIBC_EXTRA_OECONF_class-nativesdk = "" 56GLIBC_EXTRA_OECONF_class-nativesdk = ""
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 10b4bb1a7f..2d354cbec5 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -26,6 +26,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
26 file://fix-tibetian-locales.patch \ 26 file://fix-tibetian-locales.patch \
27 file://ppce6500-32b_slow_ieee754_sqrt.patch \ 27 file://ppce6500-32b_slow_ieee754_sqrt.patch \
28 file://grok_gold.patch \ 28 file://grok_gold.patch \
29 file://fix_am_rootsbindir.patch;striplevel=2 \
29 " 30 "
30SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" 31SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
31SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" 32SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
@@ -66,8 +67,6 @@ python __anonymous () {
66 d.getVar('TARGET_OS', True)) 67 d.getVar('TARGET_OS', True))
67} 68}
68 69
69export libc_cv_slibdir = "${base_libdir}"
70
71EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 70EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
72 --without-cvs --disable-profile \ 71 --without-cvs --disable-profile \
73 --disable-debug --without-gd \ 72 --disable-debug --without-gd \