From f4976b879c042a872a933b8e2d1f4a2611f00c5f Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 3 Sep 2013 20:37:01 +0800 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- .../glib-2.0/glib-2.0-configure-readlink.patch | 29 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch 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 @@ +configure.ac: change readlink -f to -m + +Change "readlink -f" to "readlink -m" since $libdir/$with_runtime_libdir +may not exist. + +This patch should go to the upstream, I will send it sooner. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -271,7 +271,7 @@ AC_ARG_WITH(runtime-libdir, + [], + [with_runtime_libdir=""]) + GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" +-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`" ++ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`" + AC_SUBST(GLIB_RUNTIME_LIBDIR) + AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR) + AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"]) +-- +1.8.1.2 + 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 \ file://Makefile-ptest.patch \ file://add-march-i486-into-CFLAGS-automatically.patch \ file://run-ptest \ + file://glib-2.0-configure-readlink.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -- 2.7.4