Skip to contentSkip to conversation

xscreensaver: link to gettext's libintl only when needed

PATCH New Vicente Olivert Riera 2 participants 3 messages Aug 29, 2014

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/1 xscreensaver: link to gettext's libintl only when needed

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 <[email protected]>
---
 package/xscreensaver/xscreensaver.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/xscreensaver/xscreensaver.mk +1 -1
index 0e84d27..1d88c03 100644
@@ -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
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 xscreensaver: link to gettext's libintl only when needed

Dear Vicente Olivert Riera,

Quoted 16 lines · 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 <[email protected]>
---
 package/xscreensaver/xscreensaver.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/xscreensaver/xscreensaver.mk +0 -0
index 0e84d27..1d88c03 100644

package/xscreensaver/xscreensaver.mk XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h · line 20

Quoted 8 lines
package/xscreensaver/xscreensaver.mk +1 -1
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 xscreensaver: link to gettext's libintl only when needed

Quoted 25 lines · Thomas Petazzoni

Dear Vicente Olivert Riera,

Quoted 22 lines · 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 <[email protected]>
---
  package/xscreensaver/xscreensaver.mk |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
package/xscreensaver/xscreensaver.mk +1 -1
index 0e84d27..1d88c03 100644
@@ -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)
Quoted 8 lines

package/xscreensaver/xscreensaver.mk XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h · line 20

Quoted 2 lines
package/xscreensaver/xscreensaver.mk +0 -0
  # 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.

Signature · 1 line
Vincent