Skip to contentSkip to conversation

package/xscreensaver: fix linking with intl

PATCH Superseded Romain Naour 3 participants 6 messages Aug 21, 2014 – Aug 25, 2014

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/2 package/xscreensaver: fix linking with intl

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 <[email protected]>
---
 package/xscreensaver/xscreensaver.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/xscreensaver/xscreensaver.mk +1 -1
index 0e84d27..ac8b09d 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_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 # otherwise we end up with host include/library dirs passed to the
 # compiler/linker
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 2/2 package/procps-ng: fix linking with intl

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 <[email protected]>
---
 package/procps-ng/procps-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/procps-ng/procps-ng.mk +1 -1
index 7628c21..8f9caf3 100644
@@ -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
Signature · 1 line
1.9.3
#2 lore raw

PATCH 2/2 package/procps-ng: fix linking with intl

Quoted 23 lines · Romain Naour

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 <[email protected]>
---
  package/procps-ng/procps-ng.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
package/procps-ng/procps-ng.mk +0 -0
index 7628c21..8f9caf3 100644

package/procps-ng/procps-ng.mk PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB · line 18

Quoted 8 lines
package/procps-ng/procps-ng.mk +1 -1
@@ -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 <[email protected]>
Signature · 1 line
Vincent
Applied
#3 lore raw

PATCH 2/2 package/procps-ng: fix linking with intl

In reply to Romain Naour

Dear Romain Naour,

Quoted 9 lines · Romain Naour

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.

Quoted 7 lines

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

Signed-off-by Romain Naour <[email protected]>
---
 package/procps-ng/procps-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

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

PATCH 1/2 package/xscreensaver: fix linking with intl

In reply to Romain Naour

Dear Romain Naour,

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

Quoted 10 lines · Romain Naour
package/xscreensaver/xscreensaver.mk +1 -1
index 0e84d27..ac8b09d 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_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

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

PATCH 1/2 package/xscreensaver: fix linking with intl

Hi Thomas,

Le 25/08/2014 20:01, Thomas Petazzoni a ?crit :

Quoted 12 lines

Dear Romain Naour,

Quoted 8 lines · Romain Naour
package/xscreensaver/xscreensaver.mk +0 -0
index 0e84d27..ac8b09d 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)
Quoted 8 lines

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

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