diff options
Diffstat (limited to 'meta/recipes-extended/gzip')
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip.inc | 1 |
2 files changed, 32 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 @@ | |||
1 | fix MakeMaker issues with using wrong SHELL/GREP | ||
2 | |||
3 | A set of substitution is being processed to all target scripts with sed by | ||
4 | replacing some key words with the detected values at configure time, this | ||
5 | is exactly not compliant with cross compling, and will cause missing path | ||
6 | errors at run time like: | ||
7 | "/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" | ||
8 | |||
9 | Fixed by removing unneeded substitution and using real runtime paths | ||
10 | instead. | ||
11 | |||
12 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Index: gzip-1.3.12/Makefile.am | ||
17 | =================================================================== | ||
18 | diff -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 \ | ||
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index 671b1eb16a..b90856e796 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc | |||
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | |||
9 | file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" | 9 | file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" |
10 | 10 | ||
11 | SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" | 11 | SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" |
12 | SRC_URI_append_class-target = " file://wrong-path-fix.patch" | ||
12 | 13 | ||
13 | inherit autotools texinfo | 14 | inherit autotools texinfo |
14 | 15 | ||