diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2017-07-31 10:14:28 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-08-03 09:00:21 +0200 |
| commit | 7e26d6b65c8489e47d5a580a0ebe5aad9296ad4c (patch) | |
| tree | 02373984fc779581c617980a0fa55c5a154accdc /patches | |
| parent | 9b4a7a48245a909983cf0fd42fac5827b951b362 (diff) | |
| download | ptxdist-7e26d6b65c8489e47d5a580a0ebe5aad9296ad4c.tar.gz ptxdist-7e26d6b65c8489e47d5a580a0ebe5aad9296ad4c.tar.xz | |
attr: add patch to remove (ignored) build error
This build error is not critical, but it throws off the error indication
in our Jenkins automated builds. Fix it to make it easier to get
notified about actual build errors.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch | 36 | ||||
| -rw-r--r-- | patches/attr-2.4.47/series | 4 |
2 files changed, 37 insertions, 3 deletions
diff --git a/patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch b/patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch new file mode 100644 index 000000000..c5125ef95 --- /dev/null +++ b/patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch @@ -0,0 +1,36 @@ +From 06d3c2ddb6ef0a9f53c36538ef018d6cca937e51 Mon Sep 17 00:00:00 2001 +From: Philipp Zabel <p.zabel@pengutronix.de> +Date: Thu, 13 Jul 2017 11:25:35 +0200 +Subject: [PATCH] build translations only if gettext is enabled + +Otherwise the Makefile will keep trying to call $(MSGFMT) -o ... with +MSGFMT not set, causing build errors: + + bash: o: command not found + ../include/buildrules:66: recipe for target 'de.mo' failed + make[3]: [de.mo] Error 127 (ignored) + +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +--- + Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4443fe092f37..896186e1e073 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,10 @@ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ + Logs/* built .census install.* install-dev.* install-lib.* *.gz + + LIB_SUBDIRS = include libmisc libattr +-TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian package ++TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc debian package ++ifeq ($(GETTEXT_ENABLE), yes) ++ TOOL_SUBDIRS += po ++endif + + SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) + +-- +2.11.0 + diff --git a/patches/attr-2.4.47/series b/patches/attr-2.4.47/series index 1233bd759..883e46360 100644 --- a/patches/attr-2.4.47/series +++ b/patches/attr-2.4.47/series @@ -1,4 +1,2 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 0001-fix-install-with-domain-user.patch -# ae36b8c004e9029248eefce58523c9d6 - git-ptx-patches magic +0002-build-translations-only-if-gettext-is-enabled.patch |