Skip to contentSkip to conversation

gzip: fix MakeMaker issues with using wrong SHELL/GREP

PATCH In review Ming Liu 2 participants 2 messages Dec 2, 2013 – Mar 26, 2014

lore
Share & tools
lore

Ming Liu

author
#0 lore raw

PATCH v2 1/1 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.

---
 .../gzip/gzip-1.6/wrong-path-fix.patch             | 31 ++++++++++++++++++++++
 meta/recipes-extended/gzip/gzip.inc                |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch new file +31 -0
new file mode 100644
index 0000000..92863d6
@@ -0,0 +1,31 @@
+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.
+
+Signed-off-by: Ming Liu <[email protected]>
+
+Upstream-Status: Pending
+
+Index: gzip-1.3.12/Makefile.am
+===================================================================
+diff -urpN a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2013-11-30 10:06:09.402234871 +0800
++++ b/Makefile.am	2013-11-30 10:13:42.952236025 +0800
+@@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
+ SUFFIXES = .in
+ .in:
+ 	$(AM_V_GEN)sed \
+-		-e 's|/bin/sh|$(SHELL)|g' \
+ 		-e 's|[@]bindir@|'\''$(bindir)'\''|g' \
+-		-e 's|[@]GREP@|$(GREP)|g' \
++		-e 's|[@]GREP@|$(base_bindir)/grep|g' \
+ 		-e 's|[@]VERSION@|$(VERSION)|g' \
+ 		$(srcdir)/[email protected] >$@-t \
+ 	  && chmod a+x $@-t \
meta/recipes-extended/gzip/gzip.inc +2 -0
index 6ec1dae..bf3469d 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
 
+SRC_URI_append_class-target = " file://wrong-path-fix.patch"
+
 inherit autotools
 
 do_install_append () {
Signature · 1 line
1.8.4.1
#1 lore raw

Ping

//Hongxu

Quoted 66 lines · Ming Liu

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.

---
  .../gzip/gzip-1.6/wrong-path-fix.patch             | 31 ++++++++++++++++++++++
  meta/recipes-extended/gzip/gzip.inc                |  2 ++
  2 files changed, 33 insertions(+)

create mode 100644 meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch

meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch new file +31 -0
new file mode 100644
index 0000000..92863d6
@@ -0,0 +1,31 @@
+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.
+
+Signed-off-by: Ming Liu <[email protected]>
+
+Upstream-Status: Pending
+
+Index: gzip-1.3.12/Makefile.am
+===================================================================
+diff -urpN a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2013-11-30 10:06:09.402234871 +0800
++++ b/Makefile.am	2013-11-30 10:13:42.952236025 +0800
+@@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
+ SUFFIXES = .in
+ .in:
+ 	$(AM_V_GEN)sed \
+-		-e 's|/bin/sh|$(SHELL)|g' \
+ 		-e 's|[@]bindir@|'\''$(bindir)'\''|g' \
+-		-e 's|[@]GREP@|$(GREP)|g' \
++		-e 's|[@]GREP@|$(base_bindir)/grep|g' \
+ 		-e 's|[@]VERSION@|$(VERSION)|g' \
+ 		$(srcdir)/[email protected] >$@-t \
+ 	  && chmod a+x $@-t \
meta/recipes-extended/gzip/gzip.inc +2 -0
index 6ec1dae..bf3469d 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
  SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
 
+SRC_URI_append_class-target = " file://wrong-path-fix.patch"
+
  inherit autotools
 
  do_install_append () {