All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/xscreensaver: fix linking with intl
@ 2014-08-21 13:56 Romain Naour
  2014-08-21 13:56 ` [Buildroot] [PATCH 2/2] package/procps-ng: " Romain Naour
  2014-08-25 18:01 ` [Buildroot] [PATCH 1/2] package/xscreensaver: " Thomas Petazzoni
  0 siblings, 2 replies; 6+ messages in thread
From: Romain Naour @ 2014-08-21 13:56 UTC (permalink / raw)
  To: buildroot

xscreensaver doesn't build with (e)glibc toolchain when gettext package is
selected.

With (e)glibc libintl is provided by the libc whereas with uClibc it's provided
by gettext.

Linking with intl is only needed if the toolchain needs gettext and locale is
set.

Fixes:
http://autobuild.buildroot.net/results/39b/39b6ad07ad59d87afeca6e427c69f580bed35700/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/xscreensaver/xscreensaver.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index 0e84d27..ac8b09d 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -14,7 +14,7 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
 XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
 	$(if $(BR2_PACKAGE_GETTEXT),gettext)
 
-XSCREENSAVER_CONF_ENV = $(if $(BR2_PACKAGE_GETTEXT),LIBS=-lintl)
+XSCREENSAVER_CONF_ENV = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 # otherwise we end up with host include/library dirs passed to the
 # compiler/linker
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] package/procps-ng: fix linking with intl
  2014-08-21 13:56 [Buildroot] [PATCH 1/2] package/xscreensaver: fix linking with intl Romain Naour
@ 2014-08-21 13:56 ` Romain Naour
  2014-08-21 14:21   ` Vicente Olivert Riera
  2014-08-25 17:55   ` Thomas Petazzoni
  2014-08-25 18:01 ` [Buildroot] [PATCH 1/2] package/xscreensaver: " Thomas Petazzoni
  1 sibling, 2 replies; 6+ messages in thread
From: Romain Naour @ 2014-08-21 13:56 UTC (permalink / raw)
  To: buildroot

procps-ng doesn't build with (e)glibc toolchain when gettext package is
selected.

With (e)glibc libintl is provided by the libc whereas with uClibc it's provided
by gettext.

Linking with intl is only needed if the toolchain needs gettext and locale is
set.

Fixes:
http://autobuild.buildroot.net/results/3e8/3e8464e0b00ce22fa02a6337159fca250d86425c/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/procps-ng/procps-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index 7628c21..8f9caf3 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -12,7 +12,7 @@ PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
 
 PROCPS_NG_DEPENDENCIES = ncurses
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 PROCPS_NG_DEPENDENCIES += gettext
 PROCPS_NG_CONF_OPT += LIBS=-lintl
 endif
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] package/procps-ng: fix linking with intl
  2014-08-21 13:56 ` [Buildroot] [PATCH 2/2] package/procps-ng: " Romain Naour
@ 2014-08-21 14:21   ` Vicente Olivert Riera
  2014-08-25 17:55   ` Thomas Petazzoni
  1 sibling, 0 replies; 6+ messages in thread
From: Vicente Olivert Riera @ 2014-08-21 14:21 UTC (permalink / raw)
  To: buildroot

On 08/21/2014 02:56 PM, Romain Naour wrote:
> procps-ng doesn't build with (e)glibc toolchain when gettext package is
> selected.
>
> With (e)glibc libintl is provided by the libc whereas with uClibc it's provided
> by gettext.
>
> Linking with intl is only needed if the toolchain needs gettext and locale is
> set.
>
> Fixes:
> http://autobuild.buildroot.net/results/3e8/3e8464e0b00ce22fa02a6337159fca250d86425c/build-end.log
>
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>   package/procps-ng/procps-ng.mk | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
> index 7628c21..8f9caf3 100644
> --- a/package/procps-ng/procps-ng.mk
> +++ b/package/procps-ng/procps-ng.mk
> @@ -12,7 +12,7 @@ PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
>
>   PROCPS_NG_DEPENDENCIES = ncurses
>
> -ifeq ($(BR2_PACKAGE_GETTEXT),y)
> +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
>   PROCPS_NG_DEPENDENCIES += gettext
>   PROCPS_NG_CONF_OPT += LIBS=-lintl
>   endif
>

Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

-- 
Vincent

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] package/procps-ng: fix linking with intl
  2014-08-21 13:56 ` [Buildroot] [PATCH 2/2] package/procps-ng: " Romain Naour
  2014-08-21 14:21   ` Vicente Olivert Riera
@ 2014-08-25 17:55   ` Thomas Petazzoni
  1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-08-25 17:55 UTC (permalink / raw)
  To: buildroot

Dear Romain Naour,

On Thu, 21 Aug 2014 15:56:07 +0200, Romain Naour wrote:
> procps-ng doesn't build with (e)glibc toolchain when gettext package is
> selected.
> 
> With (e)glibc libintl is provided by the libc whereas with uClibc it's provided
> by gettext.
> 
> Linking with intl is only needed if the toolchain needs gettext and locale is
> set.
> 
> Fixes:
> http://autobuild.buildroot.net/results/3e8/3e8464e0b00ce22fa02a6337159fca250d86425c/build-end.log
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/procps-ng/procps-ng.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] package/xscreensaver: fix linking with intl
  2014-08-21 13:56 [Buildroot] [PATCH 1/2] package/xscreensaver: fix linking with intl Romain Naour
  2014-08-21 13:56 ` [Buildroot] [PATCH 2/2] package/procps-ng: " Romain Naour
@ 2014-08-25 18:01 ` Thomas Petazzoni
  2014-08-25 21:00   ` Romain Naour
  1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2014-08-25 18:01 UTC (permalink / raw)
  To: buildroot

Dear Romain Naour,

On Thu, 21 Aug 2014 15:56:06 +0200, Romain Naour wrote:

> diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
> index 0e84d27..ac8b09d 100644
> --- a/package/xscreensaver/xscreensaver.mk
> +++ b/package/xscreensaver/xscreensaver.mk
> @@ -14,7 +14,7 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
>  XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
>  	$(if $(BR2_PACKAGE_GETTEXT),gettext)
>  
> -XSCREENSAVER_CONF_ENV = $(if $(BR2_PACKAGE_GETTEXT),LIBS=-lintl)
> +XSCREENSAVER_CONF_ENV = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)

I am not convinced by this one, because in XSCREENSAVER_DEPENDENCIES,
the gettext dependency is still added when BR2_PACKAGE_GETTEXT=y. And
also, in the Config.in of this package, there is nothing like select
BR2_PACKAGE_GETTEXT if !BR2_NEEDS_GETTEXT_IF_LOCALE.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] package/xscreensaver: fix linking with intl
  2014-08-25 18:01 ` [Buildroot] [PATCH 1/2] package/xscreensaver: " Thomas Petazzoni
@ 2014-08-25 21:00   ` Romain Naour
  0 siblings, 0 replies; 6+ messages in thread
From: Romain Naour @ 2014-08-25 21:00 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le 25/08/2014 20:01, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
> 
> On Thu, 21 Aug 2014 15:56:06 +0200, Romain Naour wrote:
> 
>> diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
>> index 0e84d27..ac8b09d 100644
>> --- a/package/xscreensaver/xscreensaver.mk
>> +++ b/package/xscreensaver/xscreensaver.mk
>> @@ -14,7 +14,7 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
>>  XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
>>  	$(if $(BR2_PACKAGE_GETTEXT),gettext)
>>  
>> -XSCREENSAVER_CONF_ENV = $(if $(BR2_PACKAGE_GETTEXT),LIBS=-lintl)
>> +XSCREENSAVER_CONF_ENV = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
> 
> I am not convinced by this one, because in XSCREENSAVER_DEPENDENCIES,
> the gettext dependency is still added when BR2_PACKAGE_GETTEXT=y. And
> also, in the Config.in of this package, there is nothing like select
> BR2_PACKAGE_GETTEXT if !BR2_NEEDS_GETTEXT_IF_LOCALE.
> 

Ok, I'll rework on it :)

Best regards,
Romain

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-08-25 21:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-21 13:56 [Buildroot] [PATCH 1/2] package/xscreensaver: fix linking with intl Romain Naour
2014-08-21 13:56 ` [Buildroot] [PATCH 2/2] package/procps-ng: " Romain Naour
2014-08-21 14:21   ` Vicente Olivert Riera
2014-08-25 17:55   ` Thomas Petazzoni
2014-08-25 18:01 ` [Buildroot] [PATCH 1/2] package/xscreensaver: " Thomas Petazzoni
2014-08-25 21:00   ` Romain Naour

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.