summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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
parentbd84192866af85c6ef8a5653547c67bb813f14a4 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.5.inc1
-rw-r--r--meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch27
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
index 603dc52595..5b222504af 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc
@@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
17 file://norm-rpath.patch \ 17 file://norm-rpath.patch \
18 file://dont-depend-on-help2man.patch \ 18 file://dont-depend-on-help2man.patch \
19 file://fix-resolve-lt-sysroot.patch \ 19 file://fix-resolve-lt-sysroot.patch \
20 file://nohardcodepaths.patch \
20 " 21 "
21 22
22SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54" 23SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54"
diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
new file mode 100644
index 0000000000..b2239fbade
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
@@ -0,0 +1,27 @@
1If for example you build on a machine with /bin/grep, then restore that sstate
2onto a machine with /usr/bin/grep, things will fail. Simply don't bother
3hardcoding paths.
4
5RP 2015/2/3
6
7Index: libtool-2.4.5/libtoolize.in
8===================================================================
9--- libtool-2.4.5.orig/libtoolize.in
10+++ libtool-2.4.5/libtoolize.in
11@@ -40,11 +40,11 @@
12
13 : ${AUTOCONF="autoconf"}
14 : ${AUTOMAKE="automake"}
15-: ${EGREP="@EGREP@"}
16-: ${FGREP="@FGREP@"}
17-: ${GREP="@GREP@"}
18-: ${LN_S="@LN_S@"}
19-: ${SED="@SED@"}
20+: ${EGREP="egrep"}
21+: ${FGREP="fgrep"}
22+: ${GREP="grep"}
23+: ${LN_S="ln -s"}
24+: ${SED="sed"}
25
26
27 ## -------------------------- ##