Thanks, applied as b9a52493d874fb4d671f950607365372163010bd. Michael
[sent from post-receive hook] On Fri, 17 Jul 2020 13:57:08 +0200, Bruno Thomsen <[email protected]> wrote: > This allows 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/gettext.in b/rules/gettext.in > index dc05739120ec..3c823eca402b 100644 > --- a/rules/gettext.in > +++ b/rules/gettext.in > @@ -20,4 +20,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 f4360aa2a852..83638543e4cb 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) > _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
