[Buildroot] [PATCH v2,1/1] package/jose: disable man pages

[Yann E. MORIN]

Fabrice, All,

On 2022-08-14 20:12 +0200, Fabrice Fontaine spake thusly:
> Disable man pages to avoid the following build failure if a non-working
> a2x is found on the system raised since bump to version 11 in commit
> b72b849ad597810823ecf9efe471a40e2427c8e8:
> 
> /usr/bin/a2x -f manpage -D /nvmedata/autobuild/instance-23/output-1/build/jose-11/build /nvmedata/autobuild/instance-23/output-1/build/jose-11/doc/man/jose.1.adoc
> /nvmedata/autobuild/instance-23/output-1/host/bin/python3: Error while finding module specification for 'asciidoc.a2x' (ModuleNotFoundError: No module named 'asciidoc')
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/ae69f7fd1258d99a5b08eeb8c67904be53eabf15
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
>  - Fix typo: false -> true
> 
>  ...dd-option-to-skip-building-man-pages.patch | 65 +++++++++++++++++++
>  package/jose/jose.mk                          |  1 +
>  2 files changed, 66 insertions(+)
>  create mode 100644 package/jose/0002-man-add-option-to-skip-building-man-pages.patch
> 
> diff --git a/package/jose/0002-man-add-option-to-skip-building-man-pages.patch b/package/jose/0002-man-add-option-to-skip-building-man-pages.patch
> new file mode 100644
> index 0000000000..d9963d2504
> --- /dev/null
> +++ b/package/jose/0002-man-add-option-to-skip-building-man-pages.patch
> @@ -0,0 +1,65 @@
> +From 506132d3edc8d062f65fdacf007a15613d27e5c5 Mon Sep 17 00:00:00 2001
> +From: Eneas U de Queiroz <cotequeiroz at gmail.com>
> +Date: Wed, 6 Apr 2022 09:49:48 -0300
> +Subject: [PATCH] man: add option to skip building man pages
> +
> +Add a 'skip_manpages' option to meson, so that man pages do not get
> +built.
> +
> +Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
> +[Retrieved from:
> +https://github.com/latchset/jose/pull/115/commits/506132d3edc8d062f65fdacf007a15613d27e5c5]

I've just shortened that to just the URL to the MR as a whole.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> +---
> + meson.build       | 24 +++++++++++++-----------
> + meson_options.txt |  1 +
> + 2 files changed, 14 insertions(+), 11 deletions(-)
> + create mode 100644 meson_options.txt
> +
> +diff --git a/meson.build b/meson.build
> +index 1edfbe7..9b40efb 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -37,7 +37,6 @@ zlib = dependency('zlib')
> + threads = dependency('threads')
> + jansson = dependency('jansson', version: '>=2.10')
> + libcrypto = dependency('libcrypto', version: '>=1.0.2')
> +-a2x = find_program('a2x', required: false)
> + 
> + mans = []
> + 
> +@@ -63,14 +62,17 @@ pkg.generate(
> +   requires: 'jansson',
> + )
> + 
> +-if a2x.found()
> +-  foreach m : mans
> +-    custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1],
> +-      command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'],
> +-      install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]),
> +-      install: true
> +-    )
> +-  endforeach
> +-else
> +-  warning('Will not build man pages due to missing dependencies!')
> ++if not get_option('skip_manpages')
> ++  a2x = find_program('a2x', required: false)
> ++  if a2x.found()
> ++    foreach m : mans
> ++      custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1],
> ++        command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'],
> ++        install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]),
> ++        install: true
> ++      )
> ++    endforeach
> ++  else
> ++    warning('Will not build man pages due to missing dependencies!')
> ++  endif
> + endif
> +diff --git a/meson_options.txt b/meson_options.txt
> +new file mode 100644
> +index 0000000..0885515
> +--- /dev/null
> ++++ b/meson_options.txt
> +@@ -0,0 +1 @@
> ++option('skip_manpages', type: 'boolean', value: false, description: 'Do not build manpages')
> diff --git a/package/jose/jose.mk b/package/jose/jose.mk
> index 8a60e20cc6..723ebe8bb9 100644
> --- a/package/jose/jose.mk
> +++ b/package/jose/jose.mk
> @@ -11,5 +11,6 @@ JOSE_LICENSE = Apache-2.0
>  JOSE_LICENSE_FILES = COPYING
>  JOSE_INSTALL_STAGING = YES
>  JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl
> +JOSE_CONF_OPTS = -Dskip_manpages=true
>  
>  $(eval $(meson-package))
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'