[Buildroot] [PATCH 1/3] package/rpm: add gettext dependency

[Yann E. MORIN <yann.morin.1998@free.fr>]

Romain, All,

On 2015-01-18 12:34 +0100, Romain Naour spake thusly:
> rpm check for libintl library if BR2_NEEDS_GETTEXT_IF_LOCALE is set.
> 
> checking for GNU gettext in libintl... yes
> checking whether to use NLS... yes
> checking where the gettext function comes from... external libintl
> checking how to link with libintl... -lintl

Do you ave a defconfig with which I could test, please?

> But the dependency on gettext package is missing to ensures
> reproducible builds.
> 
> Also, sort selected packages alphabetically in Config.in

I would prefer we do not mix feature changes with eye-candy, it makes
reviewing a bit more complicated than it should be. Next time, could you
just do that in a different patch, please?

Regards,
Yann E. MORIN.

> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/rpm/Config.in | 7 ++++---
>  package/rpm/rpm.mk    | 4 ++++
>  2 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/package/rpm/Config.in b/package/rpm/Config.in
> index 620eb1a..5ec4167 100644
> --- a/package/rpm/Config.in
> +++ b/package/rpm/Config.in
> @@ -7,12 +7,13 @@ config BR2_PACKAGE_RPM
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt
>  	depends on BR2_USE_MMU # fork()
>  	select BR2_PACKAGE_BEECRYPT
> -	select BR2_PACKAGE_POPT
> -	select BR2_PACKAGE_OPENSSL
> +	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
>  	select BR2_PACKAGE_NEON
> +	select BR2_PACKAGE_NEON_SSL
>  	select BR2_PACKAGE_NEON_XML
>  	select BR2_PACKAGE_NEON_ZLIB
> -	select BR2_PACKAGE_NEON_SSL
> +	select BR2_PACKAGE_OPENSSL
> +	select BR2_PACKAGE_POPT
>  	select BR2_PACKAGE_ZLIB
>  	help
>  	  The RPM package management system.
> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
> index c4215b5..74f5b88 100644
> --- a/package/rpm/rpm.mk
> +++ b/package/rpm/rpm.mk
> @@ -26,6 +26,10 @@ RPM_CONF_OPTS = \
>  	--with-libbeecrypt=$(STAGING_DIR) \
>  	--with-popt=$(STAGING_DIR)
>  
> +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> +RPM_DEPENDENCIES += gettext
> +endif
> +
>  ifeq ($(BR2_PACKAGE_PCRE),y)
>  RPM_DEPENDENCIES += pcre
>  RPM_CONF_OPTS += --with-pcre=external
> -- 
> 1.9.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'