From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jvOCK-0002g6-GD for ptxdist@pengutronix.de; Tue, 14 Jul 2020 18:54:29 +0200 Received: by mail-ed1-x530.google.com with SMTP id dg28so18006164edb.3 for ; Tue, 14 Jul 2020 09:54:28 -0700 (PDT) From: Bruno Thomsen Date: Tue, 14 Jul 2020 18:54:04 +0200 Message-Id: <20200714165405.4622-2-bruno.thomsen@gmail.com> In-Reply-To: <20200714165405.4622-1-bruno.thomsen@gmail.com> References: <20200714165405.4622-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/3] gettext: cli/lib install options List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Bruno Thomsen , bth@kamstrup.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 --- 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