Skip to contentSkip to conversation

package/efl: fix build without NLS

PATCH New Fabrice Fontaine 2 participants 2 messages Aug 19, 2020 – Aug 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/efl: fix build without NLS

nls is enabled by default in meson_options.txt (which is available since version 1.22.0). NLS was explicitly disabled for host-efl in commit 6deaa3d50de166ce187e8b15c70394a8eb844c03 but nothing was done for the target resulting in the following build failure:

../src/lib/elementary/elm_priv.h:189:25: warning: implicit declaration of function '_elm_dgettext'; did you mean 'dgettext'? [-Wimplicit-function-declaration]
# define E_(string) _elm_dgettext(string)

                         ^~~~~~~~~~~~~

/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/lib/elementary/libelementary.so.1.24.3.p/elc_hoversel.c.o: in function `_access_state_cb':
elc_hoversel.c:(.text+0x1210): undefined reference to `_elm_dgettext'

So enable nls dependening on BR2_SYSTEM_ENABLE_NLS and add TARGET_NLS_DEPENDENCIES to EFL_DEPENDENCIES

Fixes:
- http://autobuild.buildroot.org/results/5985b39b87c5c392b4f9b65c12008ec7b3a143fe

---
 package/efl/efl.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/efl/efl.mk +7 -1
index b8c4a506ad..f824f065ef 100644
@@ -23,7 +23,7 @@ EFL_LICENSE_FILES = \
 EFL_INSTALL_STAGING = YES
 
 EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \
-	giflib jpeg libpng luajit lz4 zlib
+	giflib jpeg libpng luajit lz4 zlib $(TARGET_NLS_DEPENDENCIES)
 
 # Configure options:
 # elua=true: build elua for the target.
@@ -46,6 +46,12 @@ EFL_CONF_OPTS = \
 	-Dsdl=false \
 	-Dvnc-server=false
 
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+EFL_CONF_OPTS += -Dnls=true
+else
+EFL_CONF_OPTS += -Dnls=false
+endif
+
 EFL_BINDINGS = luajit
 
 ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y)
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/efl: fix build without NLS

Quoted 15 lines · On Wed, 19 Aug 2020 23:48:08 +0200 Fabrice Fontaine…

nls is enabled by default in meson_options.txt (which is available since version 1.22.0). NLS was explicitly disabled for host-efl in commit 6deaa3d50de166ce187e8b15c70394a8eb844c03 but nothing was done for the target resulting in the following build failure:

../src/lib/elementary/elm_priv.h:189:25: warning: implicit declaration of function '_elm_dgettext'; did you mean 'dgettext'? [-Wimplicit-function-declaration]
# define E_(string) _elm_dgettext(string)

                         ^~~~~~~~~~~~~

/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/lib/elementary/libelementary.so.1.24.3.p/elc_hoversel.c.o: in function `_access_state_cb':
elc_hoversel.c:(.text+0x1210): undefined reference to `_elm_dgettext'

So enable nls dependening on BR2_SYSTEM_ENABLE_NLS and add TARGET_NLS_DEPENDENCIES to EFL_DEPENDENCIES

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/5985b39b87c5c392b4f9b65c12008ec7b3a143fe

---
 package/efl/efl.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com