summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-09-03 12:37:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-04 13:15:58 (GMT)
commit7d8038dfc61d7767b1b0d727c70963d447c86f0f (patch)
tree12e619cd7df942564b53899812e014a7f1da6326 /meta
parent93e7970979d6a572572b10ea2c9708f5a769f3fc (diff)
downloadpoky-7d8038dfc61d7767b1b0d727c70963d447c86f0f.tar.gz
glib-2.0: fix a host contamination issue
We will see the following warning by accident: $ bitbake nativesdk-glib-2.0 WARNING: QA Issue: nativesdk-glib-2.0-dbg: found library in wrong location: /opt/poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/share/gdb/auto-load/opt/ poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/lib/libglib-2.0.so.0.3600.4-gdb.py There are two '/opt/poky/0.5.5/sysroots' in the path when the warning comes, this is what we need since glib-2.0 has done this intentionally in its configure and Makefile. This is because the configure script uses the: ABS_GLIB_RUNTIME_LIBDIR = "readlink -f $libdir/$with_runtime_libdir`" to figure out the abs dir, so if /opt/poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/lib/ exists , there would be warning, otherwise no warning. We can change the "readlink -f" to "readlink -m" to fix the host contamination issue. Another fix could be: ABS_GLIB_RUNTIME_LIBDIR ="" But this is much more like a workaround. [YOCTO #5099] (From OE-Core rev: 3e660ec01cc62c57b379b151e43c7952e97a1c2b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch29
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
new file mode 100644
index 0000000..9759d11
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
@@ -0,0 +1,29 @@
1configure.ac: change readlink -f to -m
2
3Change "readlink -f" to "readlink -m" since $libdir/$with_runtime_libdir
4may not exist.
5
6This patch should go to the upstream, I will send it sooner.
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16--- a/configure.ac
17+++ b/configure.ac
18@@ -271,7 +271,7 @@ AC_ARG_WITH(runtime-libdir,
19 [],
20 [with_runtime_libdir=""])
21 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
22-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
23+ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`"
24 AC_SUBST(GLIB_RUNTIME_LIBDIR)
25 AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
26 AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
27--
281.8.1.2
29
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
index 0918bf5..d62c1fd 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
@@ -15,6 +15,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
15 file://Makefile-ptest.patch \ 15 file://Makefile-ptest.patch \
16 file://add-march-i486-into-CFLAGS-automatically.patch \ 16 file://add-march-i486-into-CFLAGS-automatically.patch \
17 file://run-ptest \ 17 file://run-ptest \
18 file://glib-2.0-configure-readlink.patch \
18 " 19 "
19 20
20SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"