[1/1] package/x11r7/xlib_libXpm: needs host-gettext

Message ID 20170822170304.7160-1-bernd.kuhls@t-online.de
State New
Headers show

Commit Message

Bernd Kuhls Aug. 22, 2017, 5:03 p.m.
https://git.buildroot.net/buildroot/commit/package/x11r7?id=e398ec92e9ad04e5bbae32f03cd18a53b5761517
removed the host-gettext dependency. Since then building the
package fails on hosts without the xgettext binary:

/bin/sh: xgettext: command not found

Fixes
http://autobuild.buildroot.net/results/75c/75c50e617349d327713cba9bc97163bb2c9a6943/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Petazzoni Aug. 22, 2017, 9:01 p.m. | #1
Hello,

On Tue, 22 Aug 2017 19:03:04 +0200, Bernd Kuhls wrote:
> https://git.buildroot.net/buildroot/commit/package/x11r7?id=e398ec92e9ad04e5bbae32f03cd18a53b5761517
> removed the host-gettext dependency. Since then building the
> package fails on hosts without the xgettext binary:
> 
> /bin/sh: xgettext: command not found
> 
> Fixes
> http://autobuild.buildroot.net/results/75c/75c50e617349d327713cba9bc97163bb2c9a6943/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
> index e781a8b518..ec50a42228 100644
> --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
> +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
> @@ -14,6 +14,6 @@ XLIB_LIBXPM_INSTALL_STAGING = YES
>  XLIB_LIBXPM_AUTORECONF = YES
>  XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
>  	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
> -	$(TARGET_NLS_DEPENDENCIES)
> +	host-gettext $(TARGET_NLS_DEPENDENCIES)

This is not a great fix. Indeed, TARGET_NLS_DEPENDENCIES already
contains host-gettext, but only if BR2_ENABLE_SYSTEM_NLS=y.

So instead, what we need, is to make sure xlib_libXpm doesn't build its
PO files if --disable-nls is passed.

Thomas

Patch

diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index e781a8b518..ec50a42228 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -14,6 +14,6 @@  XLIB_LIBXPM_INSTALL_STAGING = YES
 XLIB_LIBXPM_AUTORECONF = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
-	$(TARGET_NLS_DEPENDENCIES)
+	host-gettext $(TARGET_NLS_DEPENDENCIES)
 
 $(eval $(autotools-package))