summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-22 12:50:38 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-22 12:50:38 +0000
commit90e7d08446347304a9b8698cc0ca60c5218bdb81 (patch)
treefb46c099cc74568328bb5d9bb0194decea65689d /meta/packages
parenta06b6cb530bdc0587fe4930a6dd92e385218e723 (diff)
downloadpoky-90e7d08446347304a9b8698cc0ca60c5218bdb81.tar.gz
libtool: Disable a section of the libdir-la patch since its doing more harm than good. This should fix sdk .la files at the expense of having to mangle files being installed into staging
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4307 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/libtool/libtool-2.2.2/libdir-la.patch4
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.2.bb3
-rw-r--r--meta/packages/libtool/libtool-native_2.2.2.bb3
-rw-r--r--meta/packages/libtool/libtool_2.2.2.bb2
4 files changed, 7 insertions, 5 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/libdir-la.patch b/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
index a726cb2b8c..761e69779a 100644
--- a/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
+++ b/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
@@ -49,8 +49,8 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
49 for deplib in $dependency_libs; do 49 for deplib in $dependency_libs; do
50+ # Replacing uninstalled with installed can easily break crosscompilation, 50+ # Replacing uninstalled with installed can easily break crosscompilation,
51+ # since the installed path is generally the wrong architecture. -CL 51+ # since the installed path is generally the wrong architecture. -CL
52+ newdependency_libs="$newdependency_libs $deplib" 52+ # newdependency_libs="$newdependency_libs $deplib"
53+ continue 53+ # continue
54 case $deplib in 54 case $deplib in
55 *.la) 55 *.la)
56 func_basename "$deplib" 56 func_basename "$deplib"
diff --git a/meta/packages/libtool/libtool-cross_2.2.2.bb b/meta/packages/libtool/libtool-cross_2.2.2.bb
index 37643e5503..9c0b30ce5c 100644
--- a/meta/packages/libtool/libtool-cross_2.2.2.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.2.bb
@@ -1,11 +1,12 @@
1require libtool.inc 1require libtool.inc
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r12" 4PR = "r15"
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://sysroot.patch;patch=1 \
9# file://tag.patch;patch=1 \ 10# file://tag.patch;patch=1 \
10 file://nousrlib.patch;patch=1" 11 file://nousrlib.patch;patch=1"
11 12
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.2.bb
index 8b27424a6e..6b5f379318 100644
--- a/meta/packages/libtool/libtool-native_2.2.2.bb
+++ b/meta/packages/libtool/libtool-native_2.2.2.bb
@@ -1,10 +1,11 @@
1require libtool.inc 1require libtool.inc
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r9" 4PR = "r11"
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://sysroot.patch;patch=1 \
8# file://tag.patch;patch=1 \ 9# file://tag.patch;patch=1 \
9 file://nousrlib.patch;patch=1" 10 file://nousrlib.patch;patch=1"
10 11
diff --git a/meta/packages/libtool/libtool_2.2.2.bb b/meta/packages/libtool/libtool_2.2.2.bb
index 0f727cd744..05f39fa370 100644
--- a/meta/packages/libtool/libtool_2.2.2.bb
+++ b/meta/packages/libtool/libtool_2.2.2.bb
@@ -1,6 +1,6 @@
1require libtool.inc 1require libtool.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
6 file://uclibc.patch;patch=1 \ 6 file://uclibc.patch;patch=1 \