Skip to contentSkip to conversation

glib-2.0: fix a host contamination issue

PATCH Superseded Robert Yang 3 participants 6 messages Sep 3, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover glib-2.0: fix a host contamination issue

The following changes since commit 5745e45b18e5099e94b4d5a73bc97dc6d4cdc91f:

buildtools-tarball: Add python-pkgutil (2013-08-29 00:23:20 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib robert/glib-2.0
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/glib-2.0

Robert Yang (1):
glib-2.0: fix a host contamination issue

 meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 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.

BTW, fix the previous sed command's indent.

[YOCTO #5099]

---
 meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb +6 -1
index 0918bf5..cc104cc 100644
@@ -47,7 +47,12 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
 EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
 
 do_configure_prepend() {
-	sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
+    # Change the "readlink -f" to "readlink -m" to fix a host
+    # contamination issue, the later one doesn't require the
+    # components existence.
+    sed -i -e 's/^\(ABS_GLIB_RUNTIME_LIBDIR=.*readlink\) -f/\1 -m/' ${S}/configure.ac
+
+    sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
 }
 
 do_install_append() {
Signature · 1 line
1.8.1.2
#2 lore raw
Quoted 1 line · Robert Yang

+ sed -i -e 's/^\(ABS_GLIB_RUNTIME_LIBDIR=.*readlink\) -f/\1 -m/' ${S}/configure.ac

Please do this as a patch instead of a sed.

Ross

#3 lore raw
Quoted 4 lines · Ross
Quoted 1 line · Robert Yang

+ sed -i -e 's/^\(ABS_GLIB_RUNTIME_LIBDIR=.*readlink\) -f/\1 -m/' ${S}/configure.ac

Please do this as a patch instead of a sed.

It seems that sed command is preferred ? For example, we don't have to port the patch once we upgrade glib-2.0.

// Robert

Quoted 4 lines

Ross

#4 lore raw
Quoted 4 lines · Robert Yang
Quoted 1 line · Ross

On 3 September 2013 08:52, Robert Yang <[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

+ sed -i -e 's/^\(ABS_GLIB_RUNTIME_LIBDIR=.*readlink\) -f/\1 -m/'
${S}/configure.ac

Please do this as a patch instead of a sed.

It seems that sed command is preferred ? For example, we don't have to port the
patch once we upgrade glib-2.0.

Having to port a patch when it fails to apply ensures we are still doing the right thing. In contrast, these sed snippets don't generate errors when they fail, and they remain in recipes for years when no longer working/needed.

Tomas

#5 lore raw
Quoted 10 lines · Tomas Frydrych
Quoted 9 lines · Robert Yang
Quoted 5 lines · Ross
Quoted 2 lines · Robert Yang

+ sed -i -e 's/^\(ABS_GLIB_RUNTIME_LIBDIR=.*readlink\) -f/\1 -m/'
${S}/configure.ac

Please do this as a patch instead of a sed.

Quoted 9 lines
Quoted 3 lines

It seems that sed command is preferred ? For example, we don't have to port the
patch once we upgrade glib-2.0.

Having to port a patch when it fails to apply ensures we are still doing the right thing. In contrast, these sed snippets don't generate errors when they fail, and they remain in recipes for years when no longer working/needed.

Thanks, I will send a V2.

// Robert

Quoted 8 lines

Tomas

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core