libtool: Make sure ltmain.sh is always regenerated. We can't just remove it since...

diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
index 71bb4c1b8f36fc3b73f0f1edbdb24ccd9e28188e..b1956a6134e0dfec3fc7c127e296e5f431b79199 100644 (file)
--- a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
+++ b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
@@ -4,24 +4,6 @@ This is because libdir has a trailing slash which breaks the comparision.
 
 RP 2/1/10
 
-Index: libtool-2.2.6/libltdl/config/ltmain.sh
-===================================================================
---- libtool-2.2.6.orig/libltdl/config/ltmain.sh        2008-09-07 18:56:33.000000000 +0100
-+++ libtool-2.2.6/libltdl/config/ltmain.sh     2010-02-02 15:36:17.083936911 +0000
-@@ -2009,8 +2009,12 @@
-       dir="$dir$objdir"
- 
-       if test -n "$relink_command"; then
-+          # Strip any trailing slash from the destination.
-+          func_stripname '' '/' "$libdir"
-+          destlibdir=$func_stripname_result
-+
-         # Determine the prefix the user has applied to our future dir.
--        inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+        inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"`
- 
-         # Don't allow the user to place us outside of our expected
-         # location b/c this prevents finding dependent libraries that
 Index: libtool-2.2.6/libltdl/config/ltmain.m4sh
 ===================================================================
 --- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh      2010-02-02 16:06:29.793905001 +0000

diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 6710efa0ead78d76773a2e1de098b8497dbb1813..be5261f6bb865754e46092fcca35708bd2e41e69 100644 (file)
--- a/meta/packages/libtool/libtool-cross_2.2.6.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool_${PV}.bb
 
-PR = "r29"
+PR = "r30"
 PACKAGES = ""
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
@@ -22,7 +22,9 @@ do_configure_prepend () {
 }
 
 do_compile () {
-       :
+       # Sometimes this file doesn't get rebuilt, force the issue
+       rm -f ${S}/libltdl/config/ltmain.sh
+       make libltdl/config/ltmain.sh
 }
 
 do_install () {

diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb
index ec8f651889970018d3f31cbe36411c64685dddf2..c5827ffb48dee787518f9fb2d1380e557a9fffc4 100644 (file)
--- a/meta/packages/libtool/libtool-native_2.2.6.bb
+++ b/meta/packages/libtool/libtool-native_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool_${PV}.bb
 
-PR = "r22"
+PR = "r23"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
 

diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
index cad256cfe465cedaf664109007f9f75f3c63f4f9..77acbd5854abd2708f8185210f5efb1576445abe 100644 (file)
--- a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
+++ b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool_${PV}.bb
 
-PR = "r3"
+PR = "r4"
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
 inherit nativesdk

diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb
index 00e5cf8e29f8c2e8eec90d51ae6f8e9f2d70e2d8..e5deac7c40b6b6c8072f3613b6842113ef87d641 100644 (file)
--- a/meta/packages/libtool/libtool_2.2.6.bb
+++ b/meta/packages/libtool/libtool_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 
-PR = "r20"
+PR = "r21"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \
            file://trailingslash.patch;patch=1 \
@@ -16,6 +16,12 @@ inherit autotools
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
+do_compile_prepend () {
+       # Sometimes this file doesn't get rebuilt, force the issue
+       rm -f ${S}/libltdl/config/ltmain.sh
+       make libltdl/config/ltmain.sh
+}
+
 #
 # We want the results of libtool-cross preserved - don't stage anything ourselves.
 #