summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-02 08:16:49 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-02 08:16:49 +0000
commita16b7a1c066bbc365d32d86613507a688ec736e6 (patch)
treee5cb15e0e8af8c8ffcbd5966efc2e98c245d5021 /meta
parenteaf9aa4cc19a29980ec414ee0763c9c63c89d158 (diff)
downloadpoky-a16b7a1c066bbc365d32d86613507a688ec736e6.tar.gz
libtool-2.2.2: Add fix for patch from upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4405 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch4
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.2.bb2
-rw-r--r--meta/packages/libtool/libtool-native_2.2.2.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
index c8bb6577ab..4e69e2ccec 100644
--- a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
+++ b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
@@ -37,11 +37,11 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
37 depdepl="$absdir/$objdir/$depdepl" 37 depdepl="$absdir/$objdir/$depdepl"
38- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'` 38- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
39- darwin_install_name=`$ECHO $darwin_install_name` 39- darwin_install_name=`$ECHO $darwin_install_name`
40+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}` 40+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
41 if test -z "$darwin_install_name"; then 41 if test -z "$darwin_install_name"; then
42- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'` 42- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
43- darwin_install_name=`$ECHO $darwin_install_name` 43- darwin_install_name=`$ECHO $darwin_install_name`
44+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}` 44+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
45 fi 45 fi
46 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" 46 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
47 linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" 47 linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
diff --git a/meta/packages/libtool/libtool-cross_2.2.2.bb b/meta/packages/libtool/libtool-cross_2.2.2.bb
index 31b6af2c16..797aca827d 100644
--- a/meta/packages/libtool/libtool-cross_2.2.2.bb
+++ b/meta/packages/libtool/libtool-cross_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 = "r18" 4PR = "r19"
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://cross_compile.patch;patch=1 \ 7SRC_URI_append = " file://cross_compile.patch;patch=1 \
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.2.bb
index 59d9ecadbb..5b632c8a2e 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 = "r16" 4PR = "r17"
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://cross_compile.patch;patch=1 \ 6SRC_URI_append = " file://cross_compile.patch;patch=1 \
7 file://prefix.patch;patch=1" 7 file://prefix.patch;patch=1"