From: Bruno Thomsen <bruno.thomsen@gmail.com>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>, bth@kamstrup.com
Subject: [ptxdist] [PATCH 2/3] gettext: cli/lib install options
Date: Tue, 14 Jul 2020 18:54:04 +0200 [thread overview]
Message-ID: <20200714165405.4622-2-bruno.thomsen@gmail.com> (raw)
In-Reply-To: <20200714165405.4622-1-bruno.thomsen@gmail.com>
This users to deselect parts not needed, e.g. if you
only need envsubst tool.
Fixed runtime issue with xgettext missing libtextstyle.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/gettext.in | 13 +++++++++++++
rules/gettext.make | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/rules/gettext.in b/rules/gettext.in
index e2d3c042a..b7399e0e9 100644
--- a/rules/gettext.in
+++ b/rules/gettext.in
@@ -25,4 +25,17 @@ config GETTEXT_ENVSUBST
help
Substitutes environment variables in shell format strings
+config GETTEXT_TOOLS
+ bool
+ prompt "gettext/xgettext cli"
+ select GETTEXT_LIBS
+ help
+ Command line tools for translations.
+
+config GETTEXT_LIBS
+ bool
+ prompt "gettext libs"
+ help
+ System libraries for translations.
+
endif
diff --git a/rules/gettext.make b/rules/gettext.make
index f4360aa2a..83638543e 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -76,13 +76,18 @@ ifdef PTXCONF_GETTEXT_ENVSUBST
@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/envsubst)
endif
+ifdef PTXCONF_GETTEXT_TOOLS
@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/xgettext)
@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/gettext)
+endif
+ifdef PTXCONF_GETTEXT_LIBS
@$(call install_lib, gettext, 0, 0, 0644, libgettextlib-$(GETTEXT_VERSION))
@$(call install_lib, gettext, 0, 0, 0644, libasprintf)
@$(call install_lib, gettext, 0, 0, 0644, libgettextpo)
- @$(call install_lib, gettext, 0, 0, 0644,libgettextsrc-$(GETTEXT_VERSION))
+ @$(call install_lib, gettext, 0, 0, 0644, libgettextsrc-$(GETTEXT_VERSION))
+ @$(call install_lib, gettext, 0, 0, 0644, libtextstyle)
+endif
@$(call install_finish, gettext)
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2020-07-14 16:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 16:54 [ptxdist] [PATCH 1/3] gettext: version bump 0.19.8.1 -> 0.20.2 Bruno Thomsen
2020-07-14 16:54 ` Bruno Thomsen [this message]
2020-07-16 12:18 ` [ptxdist] [PATCH 2/3] gettext: cli/lib install options Bruno Thomsen
2020-07-17 6:47 ` Michael Olbrich
2020-07-17 11:57 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-14 16:54 ` [ptxdist] [PATCH 3/3] Revert "gettext: move to staging" Bruno Thomsen
2020-07-17 11:57 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-17 11:57 ` [ptxdist] [APPLIED] gettext: version bump 0.19.8.1 -> 0.20.2 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200714165405.4622-2-bruno.thomsen@gmail.com \
--to=bruno.thomsen@gmail.com \
--cc=bth@kamstrup.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox