diff options
| author | Giulio Benetti <giulio.benetti@benettiengineering.com> | 2020-01-18 23:06:11 +0100 |
|---|---|---|
| committer | Yann E. MORIN <yann.morin.1998@free.fr> | 2020-01-18 23:20:30 +0100 |
| commit | 41b9a64526b7bbd28ba2d084f3786cb536750daa (patch) | |
| tree | f6737404697e8abf620c24300154468204798b63 | |
| parent | c0cdbcbb8e314a3733f2c666274039ba92c99837 (diff) | |
| download | buildroot-41b9a64526b7bbd28ba2d084f3786cb536750daa.tar.bz2 | |
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
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
| -rw-r--r-- | package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch b/package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch new file mode 100644 index 0000000000..f1c68ee1e7 --- /dev/null +++ b/package/gettext-tiny/0001-Makefile-fix-install-failure-if-path-contains-m4-str.patch @@ -0,0 +1,31 @@ +From 2ad9d66d733396b655f05b477a5e91592378fb21 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <giulio.benetti@benettiengineering.com> +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 <giulio.benetti@benettiengineering.com> +--- + 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 + |