summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/gzip/gzip-1.6
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-11-21 04:50:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:07 +0000
commit997fb3474767a9f7c1c96267d66245373d3d1883 (patch)
tree6db004ba95cc147672e5841c6f0c42d822b3b828 /meta/recipes-extended/gzip/gzip-1.6
parent984e17d88b4b374863fb7923ff9135855ee8a9de (diff)
downloadpoky-997fb3474767a9f7c1c96267d66245373d3d1883.tar.gz
gzip: fix MakeMaker issues with using wrong SHELL/GREP
A set of substitution is being processed to all target scripts with sed by replacing some key words with the detected values at configure time, this is exactly not compliant with cross compling, and will cause missing path errors at run time like: "/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" Fixed by removing unneeded substitution and using real runtime paths instead. (From OE-Core rev: fafdf20179cf28b24459dc0263e4ba36e5843b85) Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/gzip/gzip-1.6')
-rw-r--r--meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
new file mode 100644
index 0000000000..92863d6c4b
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
@@ -0,0 +1,31 @@
1fix MakeMaker issues with using wrong SHELL/GREP
2
3A set of substitution is being processed to all target scripts with sed by
4replacing some key words with the detected values at configure time, this
5is exactly not compliant with cross compling, and will cause missing path
6errors at run time like:
7"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory"
8
9Fixed by removing unneeded substitution and using real runtime paths
10instead.
11
12Signed-off-by: Ming Liu <ming.liu@windriver.com>
13
14Upstream-Status: Pending
15
16Index: gzip-1.3.12/Makefile.am
17===================================================================
18diff -urpN a/Makefile.am b/Makefile.am
19--- a/Makefile.am 2013-11-30 10:06:09.402234871 +0800
20+++ b/Makefile.am 2013-11-30 10:13:42.952236025 +0800
21@@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
22 SUFFIXES = .in
23 .in:
24 $(AM_V_GEN)sed \
25- -e 's|/bin/sh|$(SHELL)|g' \
26 -e 's|[@]bindir@|'\''$(bindir)'\''|g' \
27- -e 's|[@]GREP@|$(GREP)|g' \
28+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
29 -e 's|[@]VERSION@|$(VERSION)|g' \
30 $(srcdir)/$@.in >$@-t \
31 && chmod a+x $@-t \