package/gettext-tiny: fix install failure if path contains "m4/" string
PATCH 1/1 package/gettext-tiny: fix install failure if path contains "m4/" string
When building with path containing "m4/" occurence(i.e. make O=output-m4) gettext-tiny install recipe copies files to wrong place and later some package using autotools fail to autoreconf(i.e. minicom). This is due to buggy gettext-tiny Makefile install recipe where they substitute every "m4/" in INSTALL destination path, including the "m4/" part of our build folder. Add patch to fix this by using sed instead of $(subst ...) to substitute only last "m4/" occurence in path.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=12481
--- ...tall-failure-if-path-contains-m4-str.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch
package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +31 -0
@@ -0,0 +1,31 @@ +From c9440e55e1179e7ce29cceae2ddb089b11c00f07 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Fri, 17 Jan 2020 18:34:42 +0100 +Subject: [PATCH] Makefile: fix install failure if path contains "m4/" string + +Actually Makefile install recipe substitutes every occurence of "m4/" in +file name of the target of the rule($@), in an absolute path there could +more than one "m4/" occurence, so install will fail. Let's change +$(susbst ...) call with a call to sed substituting only last occurence +of "m4/". + +Signed-off-by: Giulio Benetti <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4a3c3f6..1f925a3 100644 +--- a/Makefile ++++ b/Makefile +@@ -88,6 +88,6 @@ $(DESTDIR)$(datadir)/%: % + $(INSTALL) -D -m 644 $< $@ + + $(DESTDIR)$(acdir)/%: % +- $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@) ++ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(shell echo $@ | sed 's,\(.*\)m4/,\1,') + + .PHONY: all clean install +-- +2.20.1 +
Signature · 1 line
2.20.1
PATCH 1/1 package/gettext-tiny: fix install failure if path contains "m4/" string
Forgot to mention...
Quoted 8 lines · Giulio Benetti
When building with path containing "m4/" occurence(i.e. make O=output-m4) gettext-tiny install recipe copies files to wrong place and later some package using autotools fail to autoreconf(i.e. minicom). This is due to buggy gettext-tiny
Makefileinstall recipe where they substitute every "m4/" in INSTALL destination path, including the "m4/" part of our build folder. Add patch to fix this by using sed instead of $(subst ...) to substitute only last "m4/" occurence in path.
Quoted 5 lines
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=12481Signed-off-by Giulio Benetti <[email protected]>---
Patch pending upstream:
https://github.com/sabotage-linux/gettext-tiny/pull/49
Quoted 42 lines
...tall-failure-if-path-contains-m4-str.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+)create mode 100644
package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patchpackage/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +31
-0@@ -0,0 +1,31 @@ +From c9440e55e1179e7ce29cceae2ddb089b11c00f07 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Fri, 17 Jan 2020 18:34:42 +0100 +Subject: [PATCH] Makefile: fix install failure if path contains "m4/" string + +Actually Makefile install recipe substitutes every occurence of "m4/" in +file name of the target of the rule($@), in an absolute path there could +more than one "m4/" occurence, so install will fail. Let's change +$(susbst ...) call with a call to sed substituting only last occurence +of "m4/". + +Signed-off-by: Giulio Benetti <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4a3c3f6..1f925a3 100644 +--- a/Makefile ++++ b/Makefile +@@ -88,6 +88,6 @@ $(DESTDIR)$(datadir)/%: % + $(INSTALL) -D -m 644 $< $@ + + $(DESTDIR)$(acdir)/%: % +- $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@) ++ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(shell echo $@ | sed 's,\(.*\)m4/,\1,') + + .PHONY: all clean install +-- +2.20.1 +
Signature · 2 lines
Giulio Benetti Benetti Engineering sas
PATCH 1/1 package/gettext-tiny: fix install failure if path contains "m4/" string
In reply to Giulio BenettiGiulio, All,
On 2020-01-17 18:53 +0100, Giulio Benetti spake thusly:
Quoted 39 lines
When building with path containing "m4/" occurence(i.e. make O=output-m4) gettext-tiny install recipe copies files to wrong place and later some package using autotools fail to autoreconf(i.e. minicom). This is due to buggy gettext-tiny
Makefileinstall recipe where they substitute every "m4/" in INSTALL destination path, including the "m4/" part of our build folder. Add patch to fix this by using sed instead of $(subst ...) to substitute only last "m4/" occurence in path.Fixes:
https://bugs.busybox.net/show_bug.cgi?id=12481Signed-off-by Giulio Benetti <[email protected]>--- ...tall-failure-if-path-contains-m4-str.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patchpackage/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +16
-0@@ -0,0 +1,31 @@ +From c9440e55e1179e7ce29cceae2ddb089b11c00f07 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Fri, 17 Jan 2020 18:34:42 +0100 +Subject: [PATCH] Makefile: fix install failure if path contains "m4/" string + +Actually Makefile install recipe substitutes every occurence of "m4/" in +file name of the target of the rule($@), in an absolute path there could +more than one "m4/" occurence, so install will fail. Let's change +$(susbst ...) call with a call to sed substituting only last occurence +of "m4/". + +Signed-off-by: Giulio Benetti <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +
package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch line 26
Quoted 10 lines
package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +10
-0+diff --git a/Makefile b/Makefile +index 4a3c3f6..1f925a3 100644 +--- a/Makefile ++++ b/Makefile +@@ -88,6 +88,6 @@ $(DESTDIR)$(datadir)/%: % + $(INSTALL) -D -m 644 $< $@ + + $(DESTDIR)$(acdir)/%: % +- $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@) ++ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(shell echo $@ | sed 's,\(.*\)m4/,\1,')
As I suggested on your upstream pull-request, what about:
- $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@)
+ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(patsubst %m4/,%,$@)Regards,
Yann E. MORIN.
Quoted 11 lines
package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +4
-0+ .PHONY: all clean install +-- +2.20.1 +Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 package/gettext-tiny: fix install failure if path contains "m4/" string
When building with path containing "m4/" occurence(i.e. make O=output-m4) gettext-tiny install recipe copies files to wrong place and later some package using autotools fail to autoreconf(i.e. minicom). This is due to buggy gettext-tiny Makefile install recipe where they substitute every "m4/" in INSTALL destination path, including the "m4/" part of our build folder. Add patch to fix this by using $(patsubst ...) instead of $(subst m4/,,$@) to substitute only last "m4/" occurence in path.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=12481
---
Pending upstream:
https://github.com/sabotage-linux/gettext-tiny/pull/49
V1->V2:
* used $(patsubst ...) instead of sed as suggested by Heiko and xhebox
--- ...tall-failure-if-path-contains-m4-str.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch
package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 2ad9d66d733396b655f05b477a5e91592378fb21 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Fri, 17 Jan 2020 18:34:42 +0100 +Subject: [PATCH] Makefile: fix install failure if path contains "m4/" string + +Actually Makefile install recipe substitutes every occurence of "m4/" in +file name of the target of the rule($@), in an absolute path there could +more than one "m4/" occurence, so install will fail. Let's change +$(subst ...) with $(patsubst ...) substituting only last occurence of +"m4/" pattern. + +Signed-off-by: Giulio Benetti <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4a3c3f6..2e13403 100644 +--- a/Makefile ++++ b/Makefile +@@ -88,6 +88,6 @@ $(DESTDIR)$(datadir)/%: % + $(INSTALL) -D -m 644 $< $@ + + $(DESTDIR)$(acdir)/%: % +- $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@) ++ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(patsubst %m4/,%,$(dir $@))/$(notdir $@) + + .PHONY: all clean install +-- +2.20.1 +
Signature · 1 line
2.20.1
Yann E. MORIN
AppliedPATCH v2 1/1 package/gettext-tiny: fix install failure if path contains "m4/" string
Giulio, All,
On 2020-01-18 23:06 +0100, Giulio Benetti spake thusly:
Quoted 9 lines
When building with path containing "m4/" occurence(i.e. make O=output-m4) gettext-tiny install recipe copies files to wrong place and later some package using autotools fail to autoreconf(i.e. minicom). This is due to buggy gettext-tiny
Makefileinstall recipe where they substitute every "m4/" in INSTALL destination path, including the "m4/" part of our build folder. Add patch to fix this by using $(patsubst ...) instead of $(subst m4/,,$@) to substitute only last "m4/" occurence in path.
Quoted 4 lines
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=12481Signed-off-by Giulio Benetti <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 51 lines
---
Pending upstream:
https://github.com/sabotage-linux/gettext-tiny/pull/49
V1->V2:
* used $(patsubst ...) instead of sed as suggested by Heiko and xhebox--- ...tall-failure-if-path-contains-m4-str.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patchpackage/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file +31
-0@@ -0,0 +1,31 @@ +From 2ad9d66d733396b655f05b477a5e91592378fb21 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Fri, 17 Jan 2020 18:34:42 +0100 +Subject: [PATCH] Makefile: fix install failure if path contains "m4/" string + +Actually Makefile install recipe substitutes every occurence of "m4/" in +file name of the target of the rule($@), in an absolute path there could +more than one "m4/" occurence, so install will fail. Let's change +$(subst ...) with $(patsubst ...) substituting only last occurence of +"m4/" pattern. + +Signed-off-by: Giulio Benetti <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4a3c3f6..2e13403 100644 +--- a/Makefile ++++ b/Makefile +@@ -88,6 +88,6 @@ $(DESTDIR)$(datadir)/%: % + $(INSTALL) -D -m 644 $< $@ + + $(DESTDIR)$(acdir)/%: % +- $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@) ++ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(patsubst %m4/,%,$(dir $@))/$(notdir $@) + + .PHONY: all clean install +-- +2.20.1 +Signature · 1 line
2.20.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 package/gettext-tiny: fix install failure if path contains "m4/" string
In reply to Giulio BenettiQuoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
When building with path containing "m4/" occurence(i.e. make O=output-m4) gettext-tiny install recipe copies files to wrong place and later some package using autotools fail to autoreconf(i.e. minicom). This is due to buggy gettext-tiny
Makefileinstall recipe where they substitute every "m4/" in INSTALL destination path, including the "m4/" part of our build folder. Add patch to fix this by using $(patsubst ...) instead of $(subst m4/,,$@) to substitute only last "m4/" occurence in path.
Quoted 7 lines
Signed-off-by Giulio Benetti <[email protected]>---
Pending upstream:
https://github.com/sabotage-linux/gettext-tiny/pull/49V1-> V2:
* used $(patsubst ...) instead of sed as suggested by Heiko and xhebox
Committed to 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard