| Message ID | 37040459db3e6ca01e2dc8236cf57a993f1831ed.1502649259.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Sun, 13 Aug 2017 21:34:17 +0300, Baruch Siach wrote: > whois build uses the xgettext utility to build translation files. > This utility may not be available when NLS is disabled. Omit the pos and > install-pos Makefile targets from the default and the install targets > when NLS is disabled, respectively. > > Fixes: > http://autobuild.buildroot.net/results/862/862d8165a59711c970c65d90009a527315a1a6b4/ > http://autobuild.buildroot.net/results/b62/b62ec9d6f350e409731d47ffb585344c516944e8/ > http://autobuild.buildroot.net/results/be2/be28d06ae004a46c87133d6f07709c6f909288d8/ > > Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Since there is an active upstream at https://github.com/rfc1036/whois, what about doing something upstreamable, such as introducing an HAVE_NLS variable, which the Makefile uses to determine if PO files should be built or not? The Makefile already supports HAVE_LIBIDN, HAVE_ICONV, HAVE_XCRYPT, etc. so introducing HAVE_NLS should fit quite well into this, and it really is a simple patch to do. Best regards, Thomas
Hello, On Sun, 13 Aug 2017 21:34:17 +0300, Baruch Siach wrote: > whois build uses the xgettext utility to build translation files. > This utility may not be available when NLS is disabled. Omit the pos and > install-pos Makefile targets from the default and the install targets > when NLS is disabled, respectively. > > Fixes: > http://autobuild.buildroot.net/results/862/862d8165a59711c970c65d90009a527315a1a6b4/ > http://autobuild.buildroot.net/results/b62/b62ec9d6f350e409731d47ffb585344c516944e8/ > http://autobuild.buildroot.net/results/be2/be28d06ae004a46c87133d6f07709c6f909288d8/ > > Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > package/whois/whois.mk | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) Applied to master, thanks! Thomas
diff --git a/package/whois/whois.mk b/package/whois/whois.mk index b77349997883..87cc65fac4c7 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -27,13 +27,22 @@ WHOIS_DEPENDENCIES += libidn WHOIS_MAKE_ENV += HAVE_LIBIDN=1 endif +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +WHOIS_BUILD_TARGETS = +WHOIS_INSTALL_TARGETS = install +else +WHOIS_BUILD_TARGETS = Makefile.depend whois mkpasswd +WHOIS_INSTALL_TARGETS = install-whois install-mkpasswd +endif + define WHOIS_BUILD_CMDS - $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D) + $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \ + $(WHOIS_BUILD_TARGETS) -C $(@D) endef define WHOIS_INSTALL_TARGET_CMDS $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \ - BASEDIR="$(TARGET_DIR)" install -C $(@D) + BASEDIR="$(TARGET_DIR)" $(WHOIS_INSTALL_TARGETS) -C $(@D) endef $(eval $(generic-package))
whois build uses the xgettext utility to build translation files. This utility may not be available when NLS is disabled. Omit the pos and install-pos Makefile targets from the default and the install targets when NLS is disabled, respectively. Fixes: http://autobuild.buildroot.net/results/862/862d8165a59711c970c65d90009a527315a1a6b4/ http://autobuild.buildroot.net/results/b62/b62ec9d6f350e409731d47ffb585344c516944e8/ http://autobuild.buildroot.net/results/be2/be28d06ae004a46c87133d6f07709c6f909288d8/ Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- package/whois/whois.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)