package/ncmpc: fix build without NLS
PATCH 1/1 package/ncmpc: fix build without NLS
Use nls option to enable/disable NLS depending on BR2_SYSTEM_ENABLE_NLS (and fix second patch) to avoid a build failure 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.
Fixes:
- http://autobuild.buildroot.org/results/0ab0a42fd4c5c9fd5891f3b84287bd788f763ba4
--- .../ncmpc/0002-meson.build-link-with-lintl-if-needed.patch | 4 ++-- package/ncmpc/ncmpc.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch +2 -2
@@ -18,13 +18,13 @@ index 2e6defc..28e9d29 100644 --- a/meson.build +++ b/meson.build @@ -42,6 +42,7 @@ else + error('libintl.h not found') endif conf.set('ENABLE_NLS', enable_nls) ++intl_dep = cc.find_library('intl', required: false) if enable_nls -+ intl_dep = cc.find_library('intl', required: false) conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) subdir('po') - endif @@ -356,6 +357,7 @@ ncmpc = executable('ncmpc', boost_dep, pcre_dep,
package/ncmpc/ncmpc.mk +2 -1
@@ -19,7 +19,8 @@ NCMPC_LICENSE_FILES = COPYING NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ - -Ddocumentation=disabled + -Ddocumentation=disabled \ + $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) NCMPC_DEPENDENCIES += lirc-tools
Signature · 1 line
2.20.1
PATCH 1/1 package/ncmpc: fix build without NLS
Quoted 8 lines · Fabrice Fontaine
Use nls option to enable/disable NLS depending on
BR2_SYSTEM_ENABLE_NLS(and fix second patch) to avoid a build failure iflibintl.his found but xgettext is not available:Has header "
libintl.h" : YES
Library intl found: NOpo/meson.build:28:5: ERROR: Can not do gettext because xgettext is not installed.
It again took me some effort to understand what was going on here, but in the
end I got it. I rewrote the commit message and applied to master, thanks.
Don't get me wrong, your commit messages are a lot more helpful than they used
to be some time ago, I really appreciate that. But we strive for perfection :-)
Regards,
Arnout
Quoted 45 lines
Fixes:
- http://autobuild.buildroot.org/results/0ab0a42fd4c5c9fd5891f3b84287bd788f763ba4Signed-off-by Fabrice Fontaine <[email protected]>--- .../ncmpc/0002-meson.build-link-with-lintl-if-needed.patch | 4 ++-- package/ncmpc/ncmpc.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch +2
-2@@ -18,13 +18,13 @@ index 2e6defc..28e9d29 100644 --- a/meson.build +++ b/meson.build @@ -42,6 +42,7 @@ else + error('libintl.h not found') endif conf.set('ENABLE_NLS', enable_nls) ++intl_dep = cc.find_library('intl', required: false) if enable_nls -+ intl_dep = cc.find_library('intl', required: false) conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) subdir('po') - endif @@ -356,6 +357,7 @@ ncmpc = executable('ncmpc', boost_dep, pcre_dep,package/ncmpc/ncmpc.mk +2
-1@@ -19,7 +19,8 @@ NCMPC_LICENSE_FILES = COPYING NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ - -Ddocumentation=disabled + -Ddocumentation=disabled \ + $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) NCMPC_DEPENDENCIES += lirc-tools
PATCH 1/1 package/ncmpc: fix build without NLS
In reply to Fabrice FontaineQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Use nls option to enable/disable NLS depending on
BR2_SYSTEM_ENABLE_NLS(and fix second patch) to avoid a build failure iflibintl.his found but xgettext is not available:Has header "
libintl.h" : YES
Library intl found: NO
Quoted 6 lines
po/meson.build:28:5: ERROR: Can not do gettext because xgettext is not installed.
Fixes:
- http://autobuild.buildroot.org/results/0ab0a42fd4c5c9fd5891f3b84287bd788f763ba4Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard