[vlc-devel] [PATCH 4/5] contrib: libtasn1: don't build manpages when cross-compiling

Steve Lhomme robux4 at gmail.com
Wed May 31 09:14:20 CEST 2017


Since it's a contrib we probably don't care about building the docs,
so you may just add "--disable-doc" to the configure line.

On Wed, May 31, 2017 at 1:56 AM, Robert Mourning <robedmo.git at gmail.com> wrote:
> libtasn1 uses help2man to build manpages. If cross-compiling, help2man will not be
> able to get --help info from the compiled binaries.
>
> ---
>  contrib/src/libtasn1/conditional-manpages.patch | 25 +++++++++++++++++++++++++
>  contrib/src/libtasn1/rules.mak                  |  1 +
>  2 files changed, 26 insertions(+)
>  create mode 100644 contrib/src/libtasn1/conditional-manpages.patch
>
> diff --git a/contrib/src/libtasn1/conditional-manpages.patch b/contrib/src/libtasn1/conditional-manpages.patch
> new file mode 100644
> index 0000000..dee7b65
> --- /dev/null
> +++ b/contrib/src/libtasn1/conditional-manpages.patch
> @@ -0,0 +1,25 @@
> +--- libtasn1/configure.ac.orig 2017-05-26 01:46:00.416516100 -0400
> ++++ libtasn1/configure.ac      2017-05-26 01:59:33.112000000 -0400
> +@@ -42,6 +42,8 @@
> +     enable_doc=$enableval, enable_doc=yes)
> + AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
> +
> ++AM_CONDITIONAL([USE_HELP2MAN], [test "x$cross_compiling" = "xno"])
> ++
> + dnl Checks for programs.
> + AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
> + AC_LIBTOOL_WIN32_DLL
> +--- libtasn1/doc/Makefile.am.orig      2017-05-26 01:46:00.002778800 -0400
> ++++ libtasn1/doc/Makefile.am   2017-05-26 02:00:59.961000000 -0400
> +@@ -31,7 +31,11 @@
> + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
> +       --no-split --number-sections --css-include=texinfo.css
> +
> ++if USE_HELP2MAN
> + dist_man_MANS = $(gdoc_MANS) asn1Parser.1 asn1Coding.1 asn1Decoding.1
> ++else
> ++dist_man_MANS = $(gdoc_MANS)
> ++endif
> +
> + HELP2MAN_OPTS = --info-page libtasn1
> +
> diff --git a/contrib/src/libtasn1/rules.mak b/contrib/src/libtasn1/rules.mak
> index d028e70..b0bfe51 100644
> --- a/contrib/src/libtasn1/rules.mak
> +++ b/contrib/src/libtasn1/rules.mak
> @@ -17,6 +17,7 @@ libtasn1: libtasn1-$(LIBTASN1_VERSION).tar.gz .sum-libtasn1
>  ifdef HAVE_WINSTORE
>         $(APPLY) $(SRC)/libtasn1/no-benchmark.patch
>  endif
> +       $(APPLY) $(SRC)/libtasn1/conditional-manpages.patch
>         $(MOVE)
>
>  .libtasn1: libtasn1
> --
> 2.7.4
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


More information about the vlc-devel mailing list