mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

libtool: Fix tools path issues

Browse Source 
If for example you build on a machine with /bin/grep, then restore that sstate
onto a machine with /usr/bin/grep, things will fail. Simply don't bother
hardcoding paths.

This was lost during the libtool upgrade:

http://git.yoctoproject.org/cgit.cgi/poky/diff/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch?id=d4e1862453b2a4c12400de0f43f08a9871a4de60

since the path to the files changed. This restores the previous behaviour.

(From OE-Core rev: e48c06264f183c3d611a20a45914e9eeaa8f3736)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-02-03 14:24:58 +00:00
parent bd84192866
commit bcfca54628
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/libtool/libtool-2.4.5.inc
+1
View File
@@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://norm-rpath.patch \
file://dont-depend-on-help2man.patch \
file://fix-resolve-lt-sysroot.patch \
file://nohardcodepaths.patch \
"
SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54"
meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
+27
View File
@@ -0,0 +1,27 @@
If for example you build on a machine with /bin/grep, then restore that sstate
onto a machine with /usr/bin/grep, things will fail. Simply don't bother
hardcoding paths.
RP 2015/2/3
Index: libtool-2.4.5/libtoolize.in
===================================================================
--- libtool-2.4.5.orig/libtoolize.in
+++ libtool-2.4.5/libtoolize.in
@@ -40,11 +40,11 @@
: ${AUTOCONF="autoconf"}
: ${AUTOMAKE="automake"}
-: ${EGREP="@EGREP@"}
-: ${FGREP="@FGREP@"}
-: ${GREP="@GREP@"}
-: ${LN_S="@LN_S@"}
-: ${SED="@SED@"}
+: ${EGREP="egrep"}
+: ${FGREP="fgrep"}
+: ${GREP="grep"}
+: ${LN_S="ln -s"}
+: ${SED="sed"}
## -------------------------- ##