summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-11-13 13:13:37 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-11-13 13:13:37 +0000
commit5e1159bcf2e9273226d7b5b1113c551e35edc0d3 (patch)
treeb5a5d2079c198cf2c189df9ee2e3ab44bf0f4e58 /meta
parent8075bb569d908755dfa2fa9739387c34b5c51ef1 (diff)
downloadpoky-5e1159bcf2e9273226d7b5b1113c551e35edc0d3.tar.gz
libtool: do not add when linking libraries
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3136 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libtool/libtool-1.5.10/nousrlib.patch33
-rw-r--r--meta/packages/libtool/libtool-cross_1.5.10.bb6
-rw-r--r--meta/packages/libtool/libtool-native_1.5.10.bb6
3 files changed, 41 insertions, 4 deletions
diff --git a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
new file mode 100644
index 0000000000..1486337be5
--- /dev/null
+++ b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
@@ -0,0 +1,33 @@
1--- libtool-1.5.10.orig/ltmain.in
2+++ libtool-1.5.10/ltmain.in
3@@ -2637,8 +2637,6 @@
4 add="$libdir/$linklib"
5 fi
6 else
7- # We cannot seem to hardcode it, guess we'll fake it.
8- add_dir="-L$libdir"
9 # Try looking first in the location we're being installed to.
10 if test -n "$inst_prefix_dir"; then
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-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
index 4c1b7c2e1f..0d597b6035 100644
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ b/meta/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,14 +1,16 @@
1SECTION = "devel" 1SECTION = "devel"
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r6" 4PR = "r7"
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 \ 10 file://tag1.patch;patch=1 \
11 file://install-path-check.patch;patch=1" 11 file://install-path-check.patch;patch=1 \
12 file://nousrlib.patch;patch=1"
13
12S = "${WORKDIR}/libtool-${PV}" 14S = "${WORKDIR}/libtool-${PV}"
13 15
14prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" 16prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
diff --git a/meta/packages/libtool/libtool-native_1.5.10.bb b/meta/packages/libtool/libtool-native_1.5.10.bb
index 6d8b1a1d7c..0c10fd695e 100644
--- a/meta/packages/libtool/libtool-native_1.5.10.bb
+++ b/meta/packages/libtool/libtool-native_1.5.10.bb
@@ -1,13 +1,15 @@
1SECTION = "devel" 1SECTION = "devel"
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r5" 4PR = "r6"
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 \ 9 file://tag1.patch;patch=1 \
10 file://install-path-check.patch;patch=1" 10 file://install-path-check.patch;patch=1 \
11 file://nousrlib.patch;patch=1"
12
11S = "${WORKDIR}/libtool-${PV}" 13S = "${WORKDIR}/libtool-${PV}"
12 14
13inherit native 15inherit native