[Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: Add gettext/iconv support

[Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: Add gettext/iconv support

[Bernd Kuhls]

This package uses gettext/iconv when needed

fli4l at fli4lbuild64:~/br5$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/libXpm.so | grep NEEDED
 0x00000001 (NEEDED)                     Shared library: [libX11.so.6]
 0x00000001 (NEEDED)                     Shared library: [libxcb.so.1]
 0x00000001 (NEEDED)                     Shared library: [libXau.so.6]
 0x00000001 (NEEDED)                     Shared library: [libXdmcp.so.6]
 0x00000001 (NEEDED)                     Shared library: [libdl.so.0]
 0x00000001 (NEEDED)                     Shared library: [libintl.so.8]
 0x00000001 (NEEDED)                     Shared library: [libiconv.so.2]
 0x00000001 (NEEDED)                     Shared library: [libc.so.0]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xlib_libXpm/Config.in      |    1 +
 package/x11r7/xlib_libXpm/xlib_libXpm.mk |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/package/x11r7/xlib_libXpm/Config.in b/package/x11r7/xlib_libXpm/Config.in
index 528498c..73da0c2 100644
--- a/package/x11r7/xlib_libXpm/Config.in
+++ b/package/x11r7/xlib_libXpm/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XLIB_LIBXPM
 	bool "libXpm"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXT
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 766724f..997ef95 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -13,6 +13,8 @@ XLIB_LIBXPM_INSTALL_STAGING = YES
 # we patch configure.ac
 XLIB_LIBXPM_AUTORECONF = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
+	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	host-gettext
 
 $(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: Add gettext/iconv support

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 29 Mar 2015 13:23:19 +0200, Bernd Kuhls wrote:

> diff --git a/package/x11r7/xlib_libXpm/Config.in b/package/x11r7/xlib_libXpm/Config.in
> index 528498c..73da0c2 100644
> --- a/package/x11r7/xlib_libXpm/Config.in
> +++ b/package/x11r7/xlib_libXpm/Config.in
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_XLIB_LIBXPM
>  	bool "libXpm"
> +	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

Maybe this also needs a:

	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

But it would be to check if gettext and libiconv support is actually
mandatory, or only optional.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: Add gettext/iconv support

[Bernd Kuhls]

[posted and mailed]

Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8
@public.gmane.org> wrote in news:20150329134114.7d71836b at free-electrons.com:

> But it would be to check if gettext and libiconv support is actually
> mandatory, or only optional.

Hi Thomas,

according to the source code there is no mandatory check for libiconv.

Quoting line 32 from configure.ac

AC_SEARCH_LIBS([gettext], [intl], [USE_GETTEXT="yes"], [USE_GETTEXT="no"])

so gettext is optional.

Regards, Bernd