* [PATCH 1/9] gnome-desktop: Ensure we're deterministic about startup-notification dependency
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 15:56 ` [PATCH 2/9] gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS Richard Purdie
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
Without this change we may or may not include startup-notification support.
We therefore explictly include it in the dependency list.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-gnome/gnome/gnome-desktop.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index 1317fff..cfc1c2e 100644
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "GNOME library for reading .desktop files"
SECTION = "x11/gnome"
LICENSE = "GPLv2 & LGPLv2"
-DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
+DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
@@ -11,7 +11,7 @@ do_configure_prepend () {
FILES_${PN} += "${datadir}/gnome-about"
-PR = "r2"
+PR = "r3"
inherit gnome pkgconfig
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/9] gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
2011-09-25 15:56 ` [PATCH 1/9] gnome-desktop: Ensure we're deterministic about startup-notification dependency Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 15:56 ` [PATCH 3/9] cairo: Disable bfd symbol loopup since we don't list it in DEPENDS Richard Purdie
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index a52250d..ea8a5cb 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
@@ -31,7 +31,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"
-EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups"
+EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
LIBV = "2.10.0"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/9] cairo: Disable bfd symbol loopup since we don't list it in DEPENDS
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
2011-09-25 15:56 ` [PATCH 1/9] gnome-desktop: Ensure we're deterministic about startup-notification dependency Richard Purdie
2011-09-25 15:56 ` [PATCH 2/9] gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 15:56 ` [PATCH 4/9] libsndfile1: Disable external codec librbaries since we don't list " Richard Purdie
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-graphics/cairo/cairo.inc | 3 +++
meta/recipes-graphics/cairo/cairo_1.10.2.bb | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index c983a89..876acad 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -18,3 +18,6 @@ require cairo-fpu.inc
EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
inherit autotools pkgconfig
+
+# We don't depend on binutils so we need to disable this
+export ac_cv_lib_bfd_bfd_openr=no
\ No newline at end of file
diff --git a/meta/recipes-graphics/cairo/cairo_1.10.2.bb b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
index d2cadd2..8202860 100644
--- a/meta/recipes-graphics/cairo/cairo_1.10.2.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,7 +2,7 @@ require cairo.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/9] libsndfile1: Disable external codec librbaries since we don't list in DEPENDS
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
` (2 preceding siblings ...)
2011-09-25 15:56 ` [PATCH 3/9] cairo: Disable bfd symbol loopup since we don't list it in DEPENDS Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 15:56 ` [PATCH 5/9] neon: Add libproxy to DEPENDS to ensure determinstic builds Richard Purdie
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../libsndfile/libsndfile1_1.0.24.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb
index a547d76..7b8bcae 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb
@@ -4,7 +4,7 @@ AUTHOR = "Erik de Castro Lopo"
DEPENDS = "sqlite3"
SECTION = "libs/multimedia"
LICENSE = "LGPLv2.1"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz"
@@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
S = "${WORKDIR}/libsndfile-${PV}"
+EXTRA_OECONF = "--disable-external-libs"
+
inherit autotools lib_package pkgconfig
do_configure_prepend_arm() {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/9] neon: Add libproxy to DEPENDS to ensure determinstic builds
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
` (3 preceding siblings ...)
2011-09-25 15:56 ` [PATCH 4/9] libsndfile1: Disable external codec librbaries since we don't list " Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 15:56 ` [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected Richard Purdie
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-support/neon/neon_0.29.5.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/neon/neon_0.29.5.bb b/meta/recipes-support/neon/neon_0.29.5.bb
index 4653a28..8201ffe 100644
--- a/meta/recipes-support/neon/neon_0.29.5.bb
+++ b/meta/recipes-support/neon/neon_0.29.5.bb
@@ -4,9 +4,9 @@ SECTION = "libs"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
-DEPENDS = "zlib libxml2 expat time gnutls"
+DEPENDS = "zlib libxml2 expat time gnutls libproxy"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
file://pkgconfig.patch"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
` (4 preceding siblings ...)
2011-09-25 15:56 ` [PATCH 5/9] neon: Add libproxy to DEPENDS to ensure determinstic builds Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 16:14 ` Koen Kooi
2011-09-25 15:56 ` [PATCH 7/9] autotools.bbclass: Set the dynamic linker search path for libtool correctly Richard Purdie
` (2 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
libtool was being to aggressive in adding rpath to binaries. This
change stops it adding them if that path the default search path.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/libtool/libtool-cross_2.4.bb | 2 +-
.../recipes-devtools/libtool/libtool-native_2.4.bb | 2 +-
.../libtool/libtool-nativesdk_2.4.bb | 2 +-
meta/recipes-devtools/libtool/libtool.inc | 3 +-
meta/recipes-devtools/libtool/libtool/1 | 55 +++++++++++++++++
.../libtool/libtool/fix-rpath.patch | 63 ++++++++++++++++++++
meta/recipes-devtools/libtool/libtool_2.4.bb | 2 +-
7 files changed, 124 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-devtools/libtool/libtool/1
create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
index 25ac580..6d512b1 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r2"
+PR = "r4"
PACKAGES = ""
SRC_URI += "file://prefix.patch"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
index 423622f..3d0998e 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
DEPENDS = ""
-PR = "r2"
+PR = "r4"
SRC_URI += "file://prefix.patch"
inherit native
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
index 4f67fed..a96d1d1 100644
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r2"
+PR = "r4"
SRC_URI += "file://prefix.patch"
inherit nativesdk
diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc
index d423e49..ef9095b 100644
--- a/meta/recipes-devtools/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool.inc
@@ -15,7 +15,8 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://resolve-sysroot.patch \
file://use-sysroot-in-libpath.patch \
file://fix-final-rpath.patch \
- file://avoid_absolute_paths_for_general_utils.patch "
+ file://avoid_absolute_paths_for_general_utils.patch \
+ file://fix-rpath.patch "
do_compile_prepend () {
# Sometimes this file doesn't get rebuilt, force the issue
diff --git a/meta/recipes-devtools/libtool/libtool/1 b/meta/recipes-devtools/libtool/libtool/1
new file mode 100644
index 0000000..b3ee955
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/1
@@ -0,0 +1,55 @@
+Index: libtool-2.4/libltdl/config/ltmain.m4sh
+===================================================================
+--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100
++++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100
+@@ -7264,8 +7264,14 @@
+ esac
+ fi
+ else
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append dep_rpath " $flag"
++ # We only want to hardcode in an rpath if it isn't in the
++ # default dlsearch path.
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *) eval flag=\"$hardcode_libdir_flag_spec\"
++ func_append dep_rpath " $flag"
++ ;;
++ esac
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+@@ -8001,8 +8007,14 @@
+ esac
+ fi
+ else
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append rpath " $flag"
++ # We only want to hardcode in an rpath if it isn't in the
++ # default dlsearch path.
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *) eval flag=\"$hardcode_libdir_flag_spec\"
++ rpath+=" $flag"
++ ;;
++ esac
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+@@ -8052,8 +8064,14 @@
+ esac
+ fi
+ else
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append rpath " $flag"
++ # We only want to hardcode in an rpath if it isn't in the
++ # default dlsearch path.
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *) eval flag=\"$hardcode_libdir_flag_spec\"
++ func_append rpath " $flag"
++ ;;
++ esac
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
new file mode 100644
index 0000000..3cdeaec
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
@@ -0,0 +1,63 @@
+We don't want to add RPATHS which match default linker
+search paths, they're a waste of space. This patch
+filters libtools list and removes the ones we don't need.
+
+RP 23/9/2011
+
+Upstream-status: Pending
+
+Index: libtool-2.4/libltdl/config/ltmain.m4sh
+===================================================================
+--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100
++++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100
+@@ -7264,8 +7264,14 @@
+ esac
+ fi
+ else
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append dep_rpath " $flag"
++ # We only want to hardcode in an rpath if it isn't in the
++ # default dlsearch path.
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *) eval flag=\"$hardcode_libdir_flag_spec\"
++ func_append dep_rpath " $flag"
++ ;;
++ esac
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+@@ -8001,8 +8007,14 @@
+ esac
+ fi
+ else
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append rpath " $flag"
++ # We only want to hardcode in an rpath if it isn't in the
++ # default dlsearch path.
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *) eval flag=\"$hardcode_libdir_flag_spec\"
++ rpath+=" $flag"
++ ;;
++ esac
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+@@ -8052,8 +8064,14 @@
+ esac
+ fi
+ else
+- eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append rpath " $flag"
++ # We only want to hardcode in an rpath if it isn't in the
++ # default dlsearch path.
++ case " $sys_lib_dlsearch_path " in
++ *" $libdir "*) ;;
++ *) eval flag=\"$hardcode_libdir_flag_spec\"
++ func_append rpath " $flag"
++ ;;
++ esac
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.bb
index e1a9a10..3002215 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r2"
+PR = "r4"
#
# We want the results of libtool-cross preserved - don't stage anything ourselves.
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 0/9] Various misc fixes/cleanups
@ 2011-09-25 15:56 Richard Purdie
2011-09-25 15:56 ` [PATCH 1/9] gnome-desktop: Ensure we're deterministic about startup-notification dependency Richard Purdie
` (8 more replies)
0 siblings, 9 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
I've placed various misc fixes/cleanups into the git repository at:
git://git.openembedded.org/openembedded-core-contrib rpurdie/master
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/master
Richard Purdie (9):
gnome-desktop: Ensure we're deterministic about startup-notification
dependency
gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS
cairo: Disable bfd symbol loopup since we don't list it in DEPENDS
libsndfile1: Disable external codec librbaries since we don't list in
DEPENDS
neon: Add libproxy to DEPENDS to ensure determinstic builds
libtool: Fix an issue where unnecessary rpaths were being injected
autotools.bbclass: Set the dynamic linker search path for libtool
correctly
base.bbclass: Drop legacy code that is no longer useful/used
sstate: No need to spew out a debug message per file, summarise
instead
meta/classes/autotools.bbclass | 2 +
meta/classes/base.bbclass | 30 ---------
meta/classes/native.bbclass | 3 +
meta/classes/sstate.bbclass | 7 +-
meta/recipes-devtools/libtool/libtool-cross_2.4.bb | 2 +-
.../recipes-devtools/libtool/libtool-native_2.4.bb | 2 +-
.../libtool/libtool-nativesdk_2.4.bb | 2 +-
meta/recipes-devtools/libtool/libtool.inc | 3 +-
meta/recipes-devtools/libtool/libtool/1 | 55 +++++++++++++++++
.../libtool/libtool/fix-rpath.patch | 63 ++++++++++++++++++++
meta/recipes-devtools/libtool/libtool_2.4.bb | 2 +-
meta/recipes-gnome/gnome/gnome-desktop.inc | 4 +-
meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | 4 +-
meta/recipes-graphics/cairo/cairo.inc | 3 +
meta/recipes-graphics/cairo/cairo_1.10.2.bb | 2 +-
.../libsndfile/libsndfile1_1.0.24.bb | 4 +-
meta/recipes-support/neon/neon_0.29.5.bb | 4 +-
17 files changed, 146 insertions(+), 46 deletions(-)
create mode 100644 meta/recipes-devtools/libtool/libtool/1
create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch
--
1.7.5.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 7/9] autotools.bbclass: Set the dynamic linker search path for libtool correctly
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
` (5 preceding siblings ...)
2011-09-25 15:56 ` [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected Richard Purdie
@ 2011-09-25 15:56 ` Richard Purdie
2011-09-25 15:57 ` [PATCH 8/9] base.bbclass: Drop legacy code that is no longer useful/used Richard Purdie
2011-09-25 15:57 ` [PATCH 9/9] sstate: No need to spew out a debug message per file, summarise instead Richard Purdie
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:56 UTC (permalink / raw)
To: openembedded-core
libtool obtains the search path from /etc/ld.so.conf and hardcodes /usr/lib
and /lib. This results in host contamination and variable sets of RPATH
values ending up in binaries.
By exporting the correct values for all autotools recipes we avoid this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/autotools.bbclass | 2 ++
meta/classes/native.bbclass | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 8f65b70..f213c18 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -31,6 +31,8 @@ export CONFIG_SITE = "${@siteinfo_get_files(d)}"
acpaths = "default"
EXTRA_AUTORECONF = "--exclude=autopoint"
+export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}"
+
def autotools_set_crosscompiling(d):
if not bb.data.inherits_class('native', d):
return " cross_compiling=yes"
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 9a41f19..5e45aed 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -69,6 +69,9 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
libdir = "${STAGING_DIR_NATIVE}${libdir_native}"
+# Libtool's default paths are correct for the native machine
+lt_cv_sys_lib_dlsearch_path_spec[unexport] = "1"
+
NATIVE_PACKAGE_PATH_SUFFIX = ""
bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 8/9] base.bbclass: Drop legacy code that is no longer useful/used
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
` (6 preceding siblings ...)
2011-09-25 15:56 ` [PATCH 7/9] autotools.bbclass: Set the dynamic linker search path for libtool correctly Richard Purdie
@ 2011-09-25 15:57 ` Richard Purdie
2011-09-25 15:57 ` [PATCH 9/9] sstate: No need to spew out a debug message per file, summarise instead Richard Purdie
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:57 UTC (permalink / raw)
To: openembedded-core
The code displaying console events has been handled by the bitbake
UI since 1.8 so the legacy code path can be removed. If a log event
is wanted, there are much better (and more complete) ways to do this
so remove the EVENTLOG code too.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/base.bbclass | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 918d859..9144f9c 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -205,31 +205,7 @@ python base_eventhandler() {
from bb import note, error, data
from bb.event import getName
- messages = {}
- messages["Completed"] = "completed"
- messages["Succeeded"] = "completed"
- messages["Started"] = "started"
- messages["Failed"] = "failed"
-
name = getName(e)
- msg = ""
- if name.startswith("Pkg"):
- msg += "package %s: " % data.getVar("P", e.data, 1)
- msg += messages.get(name[3:]) or name[3:]
- elif name.startswith("Task"):
- msg += "package %s: task %s: " % (data.getVar("PF", e.data, 1), e.task)
- msg += messages.get(name[4:]) or name[4:]
- elif name.startswith("Build"):
- msg += "build %s: " % e.name
- msg += messages.get(name[5:]) or name[5:]
- elif name == "UnsatisfiedDep":
- msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
-
- # Only need to output when using 1.8 or lower, the UI code handles it
- # otherwise
- if (int(bb.__version__.split(".")[0]) <= 1 and int(bb.__version__.split(".")[1]) <= 8):
- if msg:
- note(msg)
if name.startswith("BuildStarted"):
bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
@@ -275,12 +251,6 @@ python base_eventhandler() {
if not data in e.__dict__:
return
-
- log = data.getVar("EVENTLOG", e.data, 1)
- if log:
- logfile = file(log, "a")
- logfile.write("%s\n" % msg)
- logfile.close()
}
addtask configure after do_unpack do_patch
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 9/9] sstate: No need to spew out a debug message per file, summarise instead
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
` (7 preceding siblings ...)
2011-09-25 15:57 ` [PATCH 8/9] base.bbclass: Drop legacy code that is no longer useful/used Richard Purdie
@ 2011-09-25 15:57 ` Richard Purdie
8 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-25 15:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/sstate.bbclass | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 91f209a..eee04ab 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -114,15 +114,16 @@ def sstate_install(ss, d):
for state in ss['dirs']:
oe.path.copytree(state[1], state[2])
for walkroot, dirs, files in os.walk(state[1]):
+ bb.debug(2, "Staging files from %s to %s" % (state[1], state[2]))
for file in files:
srcpath = os.path.join(walkroot, file)
dstpath = srcpath.replace(state[1], state[2])
- bb.debug(2, "Staging %s to %s" % (srcpath, dstpath))
+ #bb.debug(2, "Staging %s to %s" % (srcpath, dstpath))
sharedfiles.append(dstpath)
for dir in dirs:
srcdir = os.path.join(walkroot, dir)
dstdir = srcdir.replace(state[1], state[2])
- bb.debug(2, "Staging %s to %s" % (srcdir, dstdir))
+ #bb.debug(2, "Staging %s to %s" % (srcdir, dstdir))
if not dstdir.endswith("/"):
dstdir = dstdir + "/"
shareddirs.append(dstdir)
@@ -355,12 +356,12 @@ def sstate_package(ss, d):
for file in files:
srcpath = os.path.join(walkroot, file)
dstpath = srcpath.replace(state[1], sstatebuild + state[0])
- bb.debug(2, "Preparing %s for packaging at %s" % (srcpath, dstpath))
make_relative_symlink(srcpath, dstpath, d)
for dir in dirs:
srcpath = os.path.join(walkroot, dir)
dstpath = srcpath.replace(state[1], sstatebuild + state[0])
make_relative_symlink(srcpath, dstpath, d)
+ bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0]))
oe.path.copytree(state[1], sstatebuild + state[0])
workdir = bb.data.getVar('WORKDIR', d, True)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected
2011-09-25 15:56 ` [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected Richard Purdie
@ 2011-09-25 16:14 ` Koen Kooi
2011-09-26 16:57 ` Richard Purdie
0 siblings, 1 reply; 12+ messages in thread
From: Koen Kooi @ 2011-09-25 16:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 25 sep. 2011, om 17:56 heeft Richard Purdie het volgende geschreven:
> libtool was being to aggressive in adding rpath to binaries. This
> change stops it adding them if that path the default search path.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-devtools/libtool/libtool-cross_2.4.bb | 2 +-
> .../recipes-devtools/libtool/libtool-native_2.4.bb | 2 +-
> .../libtool/libtool-nativesdk_2.4.bb | 2 +-
> meta/recipes-devtools/libtool/libtool.inc | 3 +-
> meta/recipes-devtools/libtool/libtool/1 | 55 +++++++++++++++++
> .../libtool/libtool/fix-rpath.patch | 63 ++++++++++++++++++++
> meta/recipes-devtools/libtool/libtool_2.4.bb | 2 +-
> 7 files changed, 124 insertions(+), 5 deletions(-)
> create mode 100644 meta/recipes-devtools/libtool/libtool/1
> create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch
>
> diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> index 25ac580..6d512b1 100644
> --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> @@ -1,6 +1,6 @@
> require libtool-${PV}.inc
>
> -PR = "r2"
> +PR = "r4"
> PACKAGES = ""
> SRC_URI += "file://prefix.patch"
>
> diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> index 423622f..3d0998e 100644
> --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> @@ -2,7 +2,7 @@ require libtool-${PV}.inc
>
> DEPENDS = ""
>
> -PR = "r2"
> +PR = "r4"
> SRC_URI += "file://prefix.patch"
>
> inherit native
> diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> index 4f67fed..a96d1d1 100644
> --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> @@ -1,6 +1,6 @@
> require libtool-${PV}.inc
>
> -PR = "r2"
> +PR = "r4"
> SRC_URI += "file://prefix.patch"
>
> inherit nativesdk
> diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc
> index d423e49..ef9095b 100644
> --- a/meta/recipes-devtools/libtool/libtool.inc
> +++ b/meta/recipes-devtools/libtool/libtool.inc
> @@ -15,7 +15,8 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
> file://resolve-sysroot.patch \
> file://use-sysroot-in-libpath.patch \
> file://fix-final-rpath.patch \
> - file://avoid_absolute_paths_for_general_utils.patch "
> + file://avoid_absolute_paths_for_general_utils.patch \
> + file://fix-rpath.patch "
>
> do_compile_prepend () {
> # Sometimes this file doesn't get rebuilt, force the issue
> diff --git a/meta/recipes-devtools/libtool/libtool/1 b/meta/recipes-devtools/libtool/libtool/1
> new file mode 100644
> index 0000000..b3ee955
> --- /dev/null
> +++ b/meta/recipes-devtools/libtool/libtool/1
stray file?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected
2011-09-25 16:14 ` Koen Kooi
@ 2011-09-26 16:57 ` Richard Purdie
0 siblings, 0 replies; 12+ messages in thread
From: Richard Purdie @ 2011-09-26 16:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, 2011-09-25 at 18:14 +0200, Koen Kooi wrote:
> Op 25 sep. 2011, om 17:56 heeft Richard Purdie het volgende geschreven:
>
> > libtool was being to aggressive in adding rpath to binaries. This
> > change stops it adding them if that path the default search path.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/recipes-devtools/libtool/libtool-cross_2.4.bb | 2 +-
> > .../recipes-devtools/libtool/libtool-native_2.4.bb | 2 +-
> > .../libtool/libtool-nativesdk_2.4.bb | 2 +-
> > meta/recipes-devtools/libtool/libtool.inc | 3 +-
> > meta/recipes-devtools/libtool/libtool/1 | 55 +++++++++++++++++
> > .../libtool/libtool/fix-rpath.patch | 63 ++++++++++++++++++++
> > meta/recipes-devtools/libtool/libtool_2.4.bb | 2 +-
> > 7 files changed, 124 insertions(+), 5 deletions(-)
> > create mode 100644 meta/recipes-devtools/libtool/libtool/1
> > create mode 100644 meta/recipes-devtools/libtool/libtool/fix-rpath.patch
> >
> > diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> > index 25ac580..6d512b1 100644
> > --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> > +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> > @@ -1,6 +1,6 @@
> > require libtool-${PV}.inc
> >
> > -PR = "r2"
> > +PR = "r4"
> > PACKAGES = ""
> > SRC_URI += "file://prefix.patch"
> >
> > diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> > index 423622f..3d0998e 100644
> > --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> > +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> > @@ -2,7 +2,7 @@ require libtool-${PV}.inc
> >
> > DEPENDS = ""
> >
> > -PR = "r2"
> > +PR = "r4"
> > SRC_URI += "file://prefix.patch"
> >
> > inherit native
> > diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> > index 4f67fed..a96d1d1 100644
> > --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> > +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> > @@ -1,6 +1,6 @@
> > require libtool-${PV}.inc
> >
> > -PR = "r2"
> > +PR = "r4"
> > SRC_URI += "file://prefix.patch"
> >
> > inherit nativesdk
> > diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc
> > index d423e49..ef9095b 100644
> > --- a/meta/recipes-devtools/libtool/libtool.inc
> > +++ b/meta/recipes-devtools/libtool/libtool.inc
> > @@ -15,7 +15,8 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
> > file://resolve-sysroot.patch \
> > file://use-sysroot-in-libpath.patch \
> > file://fix-final-rpath.patch \
> > - file://avoid_absolute_paths_for_general_utils.patch "
> > + file://avoid_absolute_paths_for_general_utils.patch \
> > + file://fix-rpath.patch "
> >
> > do_compile_prepend () {
> > # Sometimes this file doesn't get rebuilt, force the issue
> > diff --git a/meta/recipes-devtools/libtool/libtool/1 b/meta/recipes-devtools/libtool/libtool/1
> > new file mode 100644
> > index 0000000..b3ee955
> > --- /dev/null
> > +++ b/meta/recipes-devtools/libtool/libtool/1
>
> stray file?
Good catch. I tested this a bit more, liked the results and merged it,
minus this file.
We should notice a lot of the RPATH warnings going away with this
change.
Cheers,
Richard
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-09-26 17:03 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-25 15:56 [PATCH 0/9] Various misc fixes/cleanups Richard Purdie
2011-09-25 15:56 ` [PATCH 1/9] gnome-desktop: Ensure we're deterministic about startup-notification dependency Richard Purdie
2011-09-25 15:56 ` [PATCH 2/9] gtk+: Explicitly disable xinerama since we don't have it as a DEPENDS Richard Purdie
2011-09-25 15:56 ` [PATCH 3/9] cairo: Disable bfd symbol loopup since we don't list it in DEPENDS Richard Purdie
2011-09-25 15:56 ` [PATCH 4/9] libsndfile1: Disable external codec librbaries since we don't list " Richard Purdie
2011-09-25 15:56 ` [PATCH 5/9] neon: Add libproxy to DEPENDS to ensure determinstic builds Richard Purdie
2011-09-25 15:56 ` [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected Richard Purdie
2011-09-25 16:14 ` Koen Kooi
2011-09-26 16:57 ` Richard Purdie
2011-09-25 15:56 ` [PATCH 7/9] autotools.bbclass: Set the dynamic linker search path for libtool correctly Richard Purdie
2011-09-25 15:57 ` [PATCH 8/9] base.bbclass: Drop legacy code that is no longer useful/used Richard Purdie
2011-09-25 15:57 ` [PATCH 9/9] sstate: No need to spew out a debug message per file, summarise instead Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.