[Buildroot] [PATCH] xscreensaver: link to gettext's libintl only when needed

[Buildroot] [PATCH] xscreensaver: link to gettext's libintl only when needed

[Vicente Olivert Riera]

Use the BR2_NEEDS_GETTEXT option to link to gettext's libintl only when
it's necessary.

Fixes:
  http://autobuild.buildroot.net/results/ace/aceb83ff92957accab4e2f64e450b2d2837cb2ba/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/xscreensaver/xscreensaver.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index 0e84d27..1d88c03 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_NEED_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 # otherwise we end up with host include/library dirs passed to the
 # compiler/linker
-- 
1.7.1

[Buildroot] [PATCH] xscreensaver: link to gettext's libintl only when needed

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Fri, 29 Aug 2014 13:08:59 +0100, Vicente Olivert Riera wrote:
> Use the BR2_NEEDS_GETTEXT option to link to gettext's libintl only when
> it's necessary.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/ace/aceb83ff92957accab4e2f64e450b2d2837cb2ba/
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  package/xscreensaver/xscreensaver.mk |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
> index 0e84d27..1d88c03 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_NEED_GETTEXT_IF_LOCALE),LIBS=-lintl)
>  
>  # otherwise we end up with host include/library dirs passed to the
>  # compiler/linker

There is already http://patchwork.ozlabs.org/patch/383576/, which seems
more complete than your patch, no?

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

[Buildroot] [PATCH] xscreensaver: link to gettext's libintl only when needed

[Vicente Olivert Riera]

On 08/29/2014 04:41 PM, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
>
> On Fri, 29 Aug 2014 13:08:59 +0100, Vicente Olivert Riera wrote:
>> Use the BR2_NEEDS_GETTEXT option to link to gettext's libintl only when
>> it's necessary.
>>
>> Fixes:
>>    http://autobuild.buildroot.net/results/ace/aceb83ff92957accab4e2f64e450b2d2837cb2ba/
>>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> ---
>>   package/xscreensaver/xscreensaver.mk |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
>> index 0e84d27..1d88c03 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_NEED_GETTEXT_IF_LOCALE),LIBS=-lintl)
>>
>>   # otherwise we end up with host include/library dirs passed to the
>>   # compiler/linker
>
> There is already http://patchwork.ozlabs.org/patch/383576/, which seems
> more complete than your patch, no?
>
> Thomas
>

Oops, I missed it. Yes, that patch is more complete. Ignore mine.

-- 
Vincent