summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-01 12:17:55 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-01 12:17:55 +0000
commitb1108124b16bc8b6eced40319cafd79c6ef1d016 (patch)
tree033c0df029f4ccdd9f75e47193c5386544838e66 /meta/packages
parent06fd2b6aaf0392368c6937aa56525f1aa6e76141 (diff)
downloadpoky-b1108124b16bc8b6eced40319cafd79c6ef1d016.tar.gz
libtool-2.2.2: Add fixes for darwin, drop uclibc patch as it should no longer be needed
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4390 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch17
-rw-r--r--meta/packages/libtool/libtool-native_2.2.2.bb2
-rw-r--r--meta/packages/libtool/libtool_2.2.2.bb4
3 files changed, 20 insertions, 3 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch b/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch
new file mode 100644
index 0000000000..766b520cf2
--- /dev/null
+++ b/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch
@@ -0,0 +1,17 @@
1Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
2===================================================================
3--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 12:19:37.000000000 +0100
4+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 12:29:05.000000000 +0100
5@@ -4965,10 +4965,10 @@
6 done
7 if test -f "$absdir/$objdir/$depdepl" ; then
8 depdepl="$absdir/$objdir/$depdepl"
9- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
10+ darwin_install_name=`$host-otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
11 darwin_install_name=`$ECHO $darwin_install_name`
12 if test -z "$darwin_install_name"; then
13- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
14+ darwin_install_name=`$host-otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
15 darwin_install_name=`$ECHO $darwin_install_name`
16 fi
17 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.2.bb
index 74d4d1bfc7..3a17c180be 100644
--- a/meta/packages/libtool/libtool-native_2.2.2.bb
+++ b/meta/packages/libtool/libtool-native_2.2.2.bb
@@ -1,7 +1,7 @@
1require libtool.inc 1require libtool.inc
2require libtool_${PV}.bb 2require libtool_${PV}.bb
3 3
4PR = "r12" 4PR = "r14"
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 \
diff --git a/meta/packages/libtool/libtool_2.2.2.bb b/meta/packages/libtool/libtool_2.2.2.bb
index afc3daea48..62e0e3f2f7 100644
--- a/meta/packages/libtool/libtool_2.2.2.bb
+++ b/meta/packages/libtool/libtool_2.2.2.bb
@@ -1,10 +1,10 @@
1require libtool.inc 1require libtool.inc
2 2
3PR = "r7" 3PR = "r8"
4 4
5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
6 file://fix_static.patch;patch=1 \ 6 file://fix_static.patch;patch=1 \
7 file://uclibc.patch;patch=1 \ 7 file://darwin_fixes.patch;patch=1 \
8 file://dolt.m4" 8 file://dolt.m4"
9S = "${WORKDIR}/libtool-${PV}" 9S = "${WORKDIR}/libtool-${PV}"
10 10