summaryrefslogtreecommitdiffstats
path: root/meta/packages/libtool
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 /meta/packages/libtool
parent21c0f07d4b791ba3e2d32c00562997e39b22d366 (diff)
downloadpoky-0e55205d349e7b4b87df3a9c31dbc00caa9d235f.tar.gz
libtool-2.2.2: Update further patches
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4245 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libtool')
-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 45dd78a812..2c5df96031 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 @@
1Index: libtool-1.5.10/libtool.m4 1Index: libtool-2.2.2/libltdl/m4/libtool.m4
2=================================================================== 2===================================================================
3--- libtool-1.5.10.orig/libtool.m4 2008-04-10 16:08:19.000000000 +0100 3--- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:40:30.000000000 +0100
4+++ libtool-1.5.10/libtool.m4 2008-04-10 16:08:44.000000000 +0100 4+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-13 23:38:45.000000000 +0100
5@@ -67,7 +67,9 @@ 5@@ -97,6 +97,7 @@
6 ifdef([LT_AC_PROG_GCJ],
7 [define([LT_AC_PROG_GCJ],
8 defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
9-])])# AC_PROG_LIBTOOL
10+])
11+DOLT
12+])# AC_PROG_LIBTOOL
13 6
7 # Only expand once:
8 m4_define([LT_INIT])
9+DOLT
10 ])# LT_INIT
14 11
15 # _AC_PROG_LIBTOOL 12 # 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 8921a3efb7..327adb4304 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 @@
1 1Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
2# 2===================================================================
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher 3--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-04-13 22:40:30.000000000 +0100
4# 4+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-04-13 23:36:53.000000000 +0100
5 5@@ -842,7 +842,8 @@
6--- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
7+++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
8@@ -226,8 +226,9 @@
9 # line option must be used. 6 # line option must be used.
10 if test -z "$tagname"; then 7 if test -z "$tagname"; then
11 $echo "$modename: unable to infer tagged configuration" 8 func_echo "unable to infer tagged configuration"
12- $echo "$modename: specify a tag with \`--tag'" 1>&2 9- func_fatal_error "specify a tag with \`--tag'"
13- exit $EXIT_FAILURE 10+ func_echo "defaulting to \`CC'"
14+ $echo "$modename: defaulting to \`CC'" 11+ func_echo "if this is not correct, specify a tag with \`--tag'"
15+ $echo "$modename: if this is not correct, specify a tag with \`--tag'" 12 # else
16+# exit $EXIT_FAILURE 13 # func_verbose "using $tagname tagged configuration"
17 # else
18 # $echo "$modename: using $tagname tagged configuration"
19 fi 14 fi