diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-12 10:21:02 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:03 +0100 |
commit | 099f026bd7a1b3d8fd30fe83f838e5877f4ced7b (patch) | |
tree | 72c034b7d986131ad3491b6e111a8a6fc1fc4c72 /meta/recipes-extended/gzip/gzip-1.8 | |
parent | 3274e76fe40609ce407d3f7308b9752de0d40de2 (diff) | |
download | poky-099f026bd7a1b3d8fd30fe83f838e5877f4ced7b.tar.gz |
gzip: upgrade to 1.8
Drop the do_install musl append since the charset file is no longer installed.
Refresh the patch.
Also update the PREFERRED_VERSION.
(From OE-Core rev: c57ab66984bff1ea5596ffe592a0ca1e9ba82ab0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/gzip/gzip-1.8')
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch new file mode 100644 index 0000000000..4dc10002ed --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch | |||
@@ -0,0 +1,29 @@ | |||
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.8/Makefile.am | ||
17 | =================================================================== | ||
18 | --- gzip-1.8.orig/Makefile.am | ||
19 | +++ gzip-1.8/Makefile.am | ||
20 | @@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS) | ||
21 | SUFFIXES = .in | ||
22 | .in: | ||
23 | $(AM_V_GEN)sed \ | ||
24 | - -e 's|/bin/sh|$(SHELL)|g' \ | ||
25 | - -e 's|[@]GREP@|$(GREP)|g' \ | ||
26 | + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ | ||
27 | -e 's|[@]VERSION@|$(VERSION)|g' \ | ||
28 | $(srcdir)/$@.in >$@-t \ | ||
29 | && chmod a+x $@-t \ | ||