summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:24:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:30:55 +0000
commitbcfca5462896621a6e494e502032ec6e60f26d66 (patch)
tree222a3141aa61b86da37cbe6a57a78cb1776a24dc /meta/recipes-devtools/libtool/libtool
parentbd84192866af85c6ef8a5653547c67bb813f14a4 (diff)
downloadast2050-yocto-poky-bcfca5462896621a6e494e502032ec6e60f26d66.zip
ast2050-yocto-poky-bcfca5462896621a6e494e502032ec6e60f26d66.tar.gz
libtool: Fix tools path issues
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>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
new file mode 100644
index 0000000..b2239fb
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
@@ -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"}
+
+
+ ## -------------------------- ##
OpenPOWER on IntegriCloud