summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-13 23:56:02 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-13 23:56:02 +0000
commit20453cf7ece8dd923def7dbd6c2ee3773f19d657 (patch)
tree60c1f5afd08d55811fef30ff93339eae2c62ce8f /meta
parentd9659da1747b69901a4e3b848e8f3c3978665226 (diff)
downloadpoky-20453cf7ece8dd923def7dbd6c2ee3773f19d657.tar.gz
libtool: Don't patch limain.sh otherwise it doesn't regenerate. Drop tag1.patch it doesn't do anything
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3148 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libtool/libtool-1.5.10/nousrlib.patch22
-rw-r--r--meta/packages/libtool/libtool-1.5.10/tag1.patch13
-rw-r--r--meta/packages/libtool/libtool-cross_1.5.10.bb3
-rw-r--r--meta/packages/libtool/libtool-native_1.5.10.bb3
-rw-r--r--meta/packages/libtool/libtool_1.5.10.bb2
5 files changed, 3 insertions, 40 deletions
diff --git a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
index 1486337be5..e97b45578d 100644
--- a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
+++ b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
@@ -9,25 +9,3 @@
9 # Try looking first in the location we're being installed to. 9 # Try looking first in the location we're being installed to.
10 if test -n "$inst_prefix_dir"; then 10 if test -n "$inst_prefix_dir"; then
11 case "$libdir" in 11 case "$libdir" in
12--- libtool-1.5.10.orig/libltdl/ltmain.sh
13+++ libtool-1.5.10/libltdl/ltmain.sh
14@@ -2630,8 +2630,6 @@
15 add="$libdir/$linklib"
16 fi
17 else
18- # We cannot seem to hardcode it, guess we'll fake it.
19- add_dir="-L$libdir"
20 # Try looking first in the location we're being installed to.
21 if test -n "$inst_prefix_dir"; then
22 case "$libdir" in
23--- libtool-1.5.10.orig/ltmain.sh
24+++ libtool-1.5.10/ltmain.sh
25@@ -2630,8 +2630,6 @@
26 add="$libdir/$linklib"
27 fi
28 else
29- # We cannot seem to hardcode it, guess we'll fake it.
30- add_dir="-L$libdir"
31 # Try looking first in the location we're being installed to.
32 if test -n "$inst_prefix_dir"; then
33 case "$libdir" in
diff --git a/meta/packages/libtool/libtool-1.5.10/tag1.patch b/meta/packages/libtool/libtool-1.5.10/tag1.patch
deleted file mode 100644
index 6fefd6266d..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/tag1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: libtool-1.5.10/libltdl/ltmain.sh
2===================================================================
3--- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100
4+++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100
5@@ -232,7 +232,7 @@
6 if test -z "$tagname"; then
7 $echo "$modename: unable to infer tagged configuration"
8 $echo "$modename: specify a tag with \`--tag'" 1>&2
9- exit $EXIT_FAILURE
10+# exit $EXIT_FAILURE
11 # else
12 # $echo "$modename: using $tagname tagged configuration"
13 fi
diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
index 0d597b6035..8e6698a7a6 100644
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ b/meta/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,13 +1,12 @@
1SECTION = "devel" 1SECTION = "devel"
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r7" 4PR = "r8"
5PACKAGES = "" 5PACKAGES = ""
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" 6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
7SRC_URI_append = " file://libdir-la.patch;patch=1 \ 7SRC_URI_append = " file://libdir-la.patch;patch=1 \
8 file://prefix.patch;patch=1 \ 8 file://prefix.patch;patch=1 \
9 file://tag.patch;patch=1 \ 9 file://tag.patch;patch=1 \
10 file://tag1.patch;patch=1 \
11 file://install-path-check.patch;patch=1 \ 10 file://install-path-check.patch;patch=1 \
12 file://nousrlib.patch;patch=1" 11 file://nousrlib.patch;patch=1"
13 12
diff --git a/meta/packages/libtool/libtool-native_1.5.10.bb b/meta/packages/libtool/libtool-native_1.5.10.bb
index 0c10fd695e..55bf0d89be 100644
--- a/meta/packages/libtool/libtool-native_1.5.10.bb
+++ b/meta/packages/libtool/libtool-native_1.5.10.bb
@@ -1,12 +1,11 @@
1SECTION = "devel" 1SECTION = "devel"
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r6" 4PR = "r8"
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" 5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
6SRC_URI_append = " file://libdir-la.patch;patch=1 \ 6SRC_URI_append = " file://libdir-la.patch;patch=1 \
7 file://prefix.patch;patch=1 \ 7 file://prefix.patch;patch=1 \
8 file://tag.patch;patch=1 \ 8 file://tag.patch;patch=1 \
9 file://tag1.patch;patch=1 \
10 file://install-path-check.patch;patch=1 \ 9 file://install-path-check.patch;patch=1 \
11 file://nousrlib.patch;patch=1" 10 file://nousrlib.patch;patch=1"
12 11
diff --git a/meta/packages/libtool/libtool_1.5.10.bb b/meta/packages/libtool/libtool_1.5.10.bb
index 74d9e98107..35cebfa5c2 100644
--- a/meta/packages/libtool/libtool_1.5.10.bb
+++ b/meta/packages/libtool/libtool_1.5.10.bb
@@ -5,7 +5,7 @@ libraries) behind a consistent interface."
5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" 5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
6LICENSE = "GPL" 6LICENSE = "GPL"
7SECTION = "devel" 7SECTION = "devel"
8PR = "r4" 8PR = "r5"
9 9
10SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 10SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
11 file://autotools.patch;patch=1 \ 11 file://autotools.patch;patch=1 \