[OE-core] [PATCH 6/9] libtool: Fix an issue where unnecessary rpaths were being injected

[Richard Purdie]

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 at 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