From ff7c6f1c18a10c3822fafde943f7ba82393c15cf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Mar 2018 20:37:11 +0100 Subject: [PATCH] safeclib: fix build without wchar and host-doxygen Add a patch (sent upstream) to add a --disable-doc option Fixes: - http://autobuild.buildroot.net/results/e597843f2bb528da01d1e617929c818613b56cec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Add-disable-doc-option.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/safeclib/0001-Add-disable-doc-option.patch diff --git a/package/safeclib/0001-Add-disable-doc-option.patch b/package/safeclib/0001-Add-disable-doc-option.patch new file mode 100644 index 0000000000..5d71173f1e --- /dev/null +++ b/package/safeclib/0001-Add-disable-doc-option.patch @@ -0,0 +1,59 @@ +From 0d56b6327f6b652511c3e4c72382f4dc4d194e10 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Mar 2018 20:12:28 +0100 +Subject: [PATCH] Add --disable-doc option + +This option allows the user to disable man pages even if pod2man and +doxygen programs are found + +Signed-off-by: Fabrice Fontaine +Upstream-status: Accepted (https://github.com/rurban/safeclib/commit/86404f0e2a7f2a9cad9c916b643594d4d07721d1) +--- + Makefile.am | 2 ++ + configure.ac | 10 ++++++++++ + 2 files changed, 12 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 0f65c5c1..ce1424bb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -104,6 +104,7 @@ LIBTOOL_DISTCLEAN_FILES = \ + build-tools/test-driver + DISTCLEANFILES = .version + ++if ENABLE_DOC + MAN1_SOURCES = doc/man/man1/check_for_unsafe_apis.1 + dist_man_MANS = + if HAVE_POD2MAN +@@ -560,6 +561,7 @@ clean-local: + rm -rf $(builddir)/doc/html + rm -rf $(builddir)/doc/man + endif ++endif + + if ENABLE_GCOV + gcov: check +diff --git a/configure.ac b/configure.ac +index 0e4e5eea..33ed7326 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -339,6 +339,16 @@ else + AC_MSG_RESULT([no (default)]) + fi + ++AC_ARG_ENABLE(doc, ++ AS_HELP_STRING([--disable-doc], ++ [disable documentation @<:@default=no@:>@]), ++ [case "${enableval}" in ++ yes) enable_doc=true ;; ++ no) enable_doc=false ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-doc]) ;; ++ esac], [enable_doc=true]) ++AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue") ++ + dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better, + dnl but this is only enabled for the shared objs, and we need it in the config + dnl for our tests. +-- +2.14.1 +