[Buildroot] [PATCH 1/1] package/ncmpc: fix build without NLS

[Buildroot] [PATCH 1/1] package/ncmpc: fix build without NLS

[Fabrice Fontaine]

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../ncmpc/0002-meson.build-link-with-lintl-if-needed.patch    | 4 ++--
 package/ncmpc/ncmpc.mk                                        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch b/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
index 248086fb65..9f599c89e9 100644
--- a/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
+++ b/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
@@ -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,
diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk
index f0fe3fe374..d2204c71c6 100644
--- a/package/ncmpc/ncmpc.mk
+++ b/package/ncmpc/ncmpc.mk
@@ -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
-- 
2.20.1

[Buildroot] [PATCH 1/1] package/ncmpc: fix build without NLS

[Arnout Vandecappelle]

On 10/06/2019 11:51, Fabrice Fontaine wrote:
> 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.

 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

> 
> Fixes:
>  - http://autobuild.buildroot.org/results/0ab0a42fd4c5c9fd5891f3b84287bd788f763ba4
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  .../ncmpc/0002-meson.build-link-with-lintl-if-needed.patch    | 4 ++--
>  package/ncmpc/ncmpc.mk                                        | 3 ++-
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch b/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
> index 248086fb65..9f599c89e9 100644
> --- a/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
> +++ b/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch
> @@ -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,
> diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk
> index f0fe3fe374..d2204c71c6 100644
> --- a/package/ncmpc/ncmpc.mk
> +++ b/package/ncmpc/ncmpc.mk
> @@ -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
> 

[Buildroot] [PATCH 1/1] package/ncmpc: fix build without NLS

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > 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

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.05.x, thanks.

-- 
Bye, Peter Korsgaard