libtool: Fix breakage if the compiler flags change

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@422 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 17 insertions, 1 deletions

diff --git a/openembedded/packages/libtool/libtool-1.5.10/tag1.patch b/openembedded/packages/libtool/libtool-1.5.10/tag1.patch
new file mode 100644
index 0000000000..6fefd6266d
--- /dev/null
+++ b/openembedded/packages/libtool/libtool-1.5.10/tag1.patch
@@ -0,0 +1,13 @@
+Index: libtool-1.5.10/libltdl/ltmain.sh
+===================================================================
+--- libtool-1.5.10.orig/libltdl/ltmain.sh       2004-09-19 13:34:44.000000000 +0100
++++ libtool-1.5.10/libltdl/ltmain.sh    2006-05-25 15:28:39.000000000 +0100
+@@ -232,7 +232,7 @@
+        if test -z "$tagname"; then
+          $echo "$modename: unable to infer tagged configuration"
+          $echo "$modename: specify a tag with \`--tag'" 1>&2
+-         exit $EXIT_FAILURE
++#        exit $EXIT_FAILURE
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+        fi
diff --git a/openembedded/packages/libtool/libtool-cross_1.5.10.bb b/openembedded/packages/libtool/libtool-cross_1.5.10.bb
index dd24add3b3..22e404c9d5 100644
--- a/openembedded/packages/libtool/libtool-cross_1.5.10.bb
+++ b/openembedded/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,11 +1,13 @@
 SECTION = "devel"
 include libtool_${PV}.bb
 
+PR = "r4"
 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"
 S = "${WORKDIR}/libtool-${PV}"
 
diff --git a/openembedded/packages/libtool/libtool-native_1.5.10.bb b/openembedded/packages/libtool/libtool-native_1.5.10.bb
index fa2a6f4c8a..ff001be63c 100644
--- a/openembedded/packages/libtool/libtool-native_1.5.10.bb
+++ b/openembedded/packages/libtool/libtool-native_1.5.10.bb
@@ -1,11 +1,12 @@
 SECTION = "devel"
 include libtool_${PV}.bb
 
-PR = "r3"
+PR = "r4"
 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"
 S = "${WORKDIR}/libtool-${PV}"