libtool-{cross,native} 1.5.10: rework rpath stripping to make it controllable

diff --git a/packages/libtool/libtool-1.5.10/rpath-control.patch b/packages/libtool/libtool-1.5.10/rpath-control.patch
new file mode 100644 (file)
index 0000000..310fe3f
--- /dev/null
+++ b/packages/libtool/libtool-1.5.10/rpath-control.patch
@@ -0,0 +1,21 @@
+diff --git a/ltmain.in b/ltmain.in
+--- a/ltmain.in
++++ b/ltmain.in
+@@ -3688,6 +3705,7 @@ EOF
+         rpath="$finalize_rpath"
+         test "$mode" != relink && rpath="$compile_rpath$rpath"
+         for libdir in $rpath; do
++         if test "$OE_LT_RPATH_ALLOW" = "any" -o "${OE_LT_RPATH_ALLOW/:${libdir}:/}" != "$OE_LT_RPATH_ALLOW" ; then
+           if test -n "$hardcode_libdir_flag_spec"; then
+             if test -n "$hardcode_libdir_separator"; then
+               if test -z "$hardcode_libdirs"; then
+@@ -3712,6 +3730,9 @@ EOF
+             *) perm_rpath="$perm_rpath $libdir" ;;
+             esac
+           fi
++         else
++          echo "OE: Not hardcoding '$libdir' into rpath"
++         fi
+         done
+         # Substitute the hardcoded libdirs into the rpath.
+         if test -n "$hardcode_libdir_separator" &&

diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index f4ca30c..fbb37d8 100644 (file)
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,15 +1,14 @@
 SECTION = "devel"
 require libtool_${PV}.bb
 
-PR = "r5"
+PR = "r6"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
                    file://tag1.patch;patch=1 \
-                   file://install-path-check.patch;patch=1 \
-                   file://never-ever-do-rpath.patch;patch=1 "
+                   file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
 prefix = "${STAGING_DIR}"

diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb
index 6d8b1a1..2780ef6 100644 (file)
--- a/packages/libtool/libtool-native_1.5.10.bb
+++ b/packages/libtool/libtool-native_1.5.10.bb
@@ -1,13 +1,14 @@
 SECTION = "devel"
 require libtool_${PV}.bb
 
-PR = "r5"
+PR = "r6"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
                    file://tag1.patch;patch=1 \
-                   file://install-path-check.patch;patch=1"
+                   file://install-path-check.patch;patch=1 \
+                  file://rpath-control.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit native