mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/ncmpc: fix build without NLS

Browse Source 
The build fails if libintl.h is found but xgettext is not available:

Has header "libintl.h" : YES
Library intl found: NO

po/meson.build:28:5: ERROR: Can not do gettext because xgettext is not installed.

This is because enable_nls defaults to true if libintl.h is found. Use
the nls option to enable/disable NLS explicitly, depending on
BR2_SYSTEM_ENABLE_NLS,

Also, fix the second patch to always look for libintl, even if NLS is
not enabled. The enable_nls option disables processing the po files, but
the gettext calls in the source are still there, so we need to link with
libintl anyway.

Fixes:
 - http://autobuild.buildroot.org/results/0ab0a42fd4c5c9fd5891f3b84287bd788f763ba4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit 56fb7401b9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2019-06-10 11:51:46 +02:00
committed by Peter Korsgaard
parent e614148761
commit 6220c022d1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
View File

@@ -18,13 +18,13 @@ index 2e6defc..28e9d29 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -42,6 +42,7 @@ else @@ -42,6 +42,7 @@ else
error('libintl.h not found')
endif endif
conf.set('ENABLE_NLS', enable_nls) conf.set('ENABLE_NLS', enable_nls)
+intl_dep = cc.find_library('intl', required: false)
if enable_nls if enable_nls
+ intl_dep = cc.find_library('intl', required: false)
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
subdir('po') subdir('po')
endif
@@ -356,6 +357,7 @@ ncmpc = executable('ncmpc', @@ -356,6 +357,7 @@ ncmpc = executable('ncmpc',
boost_dep, boost_dep,
pcre_dep, pcre_dep,

3
package/ncmpc/ncmpc.mk
View File

@@ -19,7 +19,8 @@ NCMPC_LICENSE_FILES = COPYING
NCMPC_CONF_OPTS = \ NCMPC_CONF_OPTS = \
-Dcurses=ncurses \ -Dcurses=ncurses \
-Ddocumentation=disabled -Ddocumentation=disabled \
$(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled)
ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y)
NCMPC_DEPENDENCIES += lirc-tools NCMPC_DEPENDENCIES += lirc-tools