summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-13 22:39:52 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-13 22:39:52 +0000
commit0e55205d349e7b4b87df3a9c31dbc00caa9d235f (patch)
treeeab500afe6fe428ba43a03408c2cd5678e3117a6
parent21c0f07d4b791ba3e2d32c00562997e39b22d366 (diff)
downloadopenembedded-core-0e55205d349e7b4b87df3a9c31dbc00caa9d235f.tar.gz
openembedded-core-0e55205d349e7b4b87df3a9c31dbc00caa9d235f.tar.bz2
openembedded-core-0e55205d349e7b4b87df3a9c31dbc00caa9d235f.tar.xz
openembedded-core-0e55205d349e7b4b87df3a9c31dbc00caa9d235f.zip
libtool-2.2.2: Update further patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4245 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/libtool/libtool-2.2.2/add_dolt.patch21
-rw-r--r--meta/packages/libtool/libtool-2.2.2/tag.patch27
2 files changed, 20 insertions, 28 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/add_dolt.patch b/meta/packages/libtool/libtool-2.2.2/add_dolt.patch
index 45dd78a81..2c5df9603 100644
--- a/meta/packages/libtool/libtool-2.2.2/add_dolt.patch
+++ b/meta/packages/libtool/libtool-2.2.2/add_dolt.patch
@@ -1,15 +1,12 @@
-Index: libtool-1.5.10/libtool.m4
+Index: libtool-2.2.2/libltdl/m4/libtool.m4
===================================================================
---- libtool-1.5.10.orig/libtool.m4 2008-04-10 16:08:19.000000000 +0100
-+++ libtool-1.5.10/libtool.m4 2008-04-10 16:08:44.000000000 +0100
-@@ -67,7 +67,9 @@
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
-+])
-+DOLT
-+])# AC_PROG_LIBTOOL
+--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:40:30.000000000 +0100
++++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-13 23:38:45.000000000 +0100
+@@ -97,6 +97,7 @@
+ # Only expand once:
+ m4_define([LT_INIT])
++DOLT
+ ])# LT_INIT
- # _AC_PROG_LIBTOOL
+ # Old names:
diff --git a/meta/packages/libtool/libtool-2.2.2/tag.patch b/meta/packages/libtool/libtool-2.2.2/tag.patch
index 8921a3efb..327adb430 100644
--- a/meta/packages/libtool/libtool-2.2.2/tag.patch
+++ b/meta/packages/libtool/libtool-2.2.2/tag.patch
@@ -1,19 +1,14 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
-+++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
-@@ -226,8 +226,9 @@
+Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
+===================================================================
+--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-04-13 22:40:30.000000000 +0100
++++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-04-13 23:36:53.000000000 +0100
+@@ -842,7 +842,8 @@
# line option must be used.
if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
+ func_echo "unable to infer tagged configuration"
+- func_fatal_error "specify a tag with \`--tag'"
++ func_echo "defaulting to \`CC'"
++ func_echo "if this is not correct, specify a tag with \`--tag'"
+ # else
+ # func_verbose "using $tagname tagged configuration"
fi