mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 00:32:12 +02:00
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
This commit is contained in:
@@ -37,11 +37,11 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
|
||||
depdepl="$absdir/$objdir/$depdepl"
|
||||
- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
|
||||
- darwin_install_name=`$ECHO $darwin_install_name`
|
||||
+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}`
|
||||
+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
||||
if test -z "$darwin_install_name"; then
|
||||
- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
|
||||
- darwin_install_name=`$ECHO $darwin_install_name`
|
||||
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}`
|
||||
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
||||
fi
|
||||
compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
|
||||
linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
require libtool.inc
|
||||
require libtool_${PV}.bb
|
||||
|
||||
PR = "r18"
|
||||
PR = "r19"
|
||||
PACKAGES = ""
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
|
||||
SRC_URI_append = " file://cross_compile.patch;patch=1 \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
require libtool.inc
|
||||
require libtool_${PV}.bb
|
||||
|
||||
PR = "r16"
|
||||
PR = "r17"
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
|
||||
SRC_URI_append = " file://cross_compile.patch;patch=1 \
|
||||
file://prefix.patch;patch=1"
|
||||
|
||||
Reference in New Issue
Block a user