[oe-commits] org.oe.dev libtool-{cross, native} 1.5.10: rework rpath stripping to make it controllable

[polyonymous commit]

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

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 08a26533ed8dab5a13a6f3dbd0f683fd1d7508e8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=08a26533ed8dab5a13a6f3dbd0f683fd1d7508e8
Files:
1
packages/libtool/libtool-1.5.10/rpath-control.patch
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
Diffs:

#
# mt diff -r6b88b1247ef1b0bcc9568b3b7feda1c77c827589 -r08a26533ed8dab5a13a6f3dbd0f683fd1d7508e8
#
# 
# 
# add_file "packages/libtool/libtool-1.5.10/rpath-control.patch"
#  content [4b31b6687ccede8fff1b635bac99942b42df9243]
# 
# patch "packages/libtool/libtool-cross_1.5.10.bb"
#  from [3b24a14b6df3c0d9f7064a5bab60102a3ebe1b57]
#    to [1d9d18b4a0241cde485f05db92de7f18738d2507]
# 
# patch "packages/libtool/libtool-native_1.5.10.bb"
#  from [bc799a0464069f3531cbb0a017c4d8d2a1afd63e]
#    to [3db44cdc921e61d2528664266cd0eda2cbf4d430]
# 
============================================================
--- packages/libtool/libtool-1.5.10/rpath-control.patch	4b31b6687ccede8fff1b635bac99942b42df9243
+++ packages/libtool/libtool-1.5.10/rpath-control.patch	4b31b6687ccede8fff1b635bac99942b42df9243
@@ -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" &&
============================================================
--- packages/libtool/libtool-cross_1.5.10.bb	3b24a14b6df3c0d9f7064a5bab60102a3ebe1b57
+++ packages/libtool/libtool-cross_1.5.10.bb	1d9d18b4a0241cde485f05db92de7f18738d2507
@@ -1,15 +1,14 @@ require libtool_${PV}.bb
 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}"
============================================================
--- packages/libtool/libtool-native_1.5.10.bb	bc799a0464069f3531cbb0a017c4d8d2a1afd63e
+++ packages/libtool/libtool-native_1.5.10.bb	3db44cdc921e61d2528664266cd0eda2cbf4d430
@@ -1,13 +1,14 @@ require libtool_${PV}.bb
 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