libtool: Only apply rpath-control patch to libtool-cross, not libtool-native

diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index 0d0b90a..7374f10 100644 (file)
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -4,7 +4,8 @@ require libtool_${PV}.bb
 PR = "r10"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
+SRC_URI_append = " file://rpath-control.patch;patch=1 \
+                   file://libdir-la.patch;patch=1 \
                    file://libdir-la2.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \

diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb
index ec3dd60..59b323d 100644 (file)
--- a/packages/libtool/libtool-native_1.5.10.bb
+++ b/packages/libtool/libtool-native_1.5.10.bb
@@ -1,15 +1,14 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r9"
+PR = "r10"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://libdir-la2.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
                    file://install-path-check.patch;patch=1 \
-                  file://nousrlib.patch;patch=1 \
-                  file://rpath-control.patch;patch=1"
+                  file://nousrlib.patch;patch=1"
 
 S = "${WORKDIR}/libtool-${PV}"