mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-24 14:03:29 +08:00
a8b788e194
Use upstream patch to fix patch fuzz and avoid the following build
failure raised since commit 8f88a644ed
which reduced the fuzz factor:
Applying 0001-configure.ac-add-disable-doc-option.patch using patch:
patching file Makefile.am
Hunk #1 FAILED at 18.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej
Fixes:
- http://autobuild.buildroot.org/results/4cfa513e024ea2cb2058fde4ffdd727bd379dae7
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
53 lines
1.3 KiB
Diff
53 lines
1.3 KiB
Diff
From e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sun, 22 Sep 2019 09:27:24 +0200
|
|
Subject: configure.ac: add --disable-doc option
|
|
|
|
Add --disable-doc option to allow the user to disable documentation
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Upstream: https://git.savannah.gnu.org/cgit/gengetopt.git/commit/?id=e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a
|
|
---
|
|
Makefile.am | 6 +++++-
|
|
configure.ac | 7 +++++++
|
|
2 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 1f184c2..76ac21a 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -18,7 +18,11 @@
|
|
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
|
|
|
|
EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
|
|
-SUBDIRS = gl src doc tests
|
|
+SUBDIRS = gl src tests
|
|
+
|
|
+if ENABLE_DOC
|
|
+SUBDIRS += doc
|
|
+endif
|
|
|
|
gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 0ee89db..915706c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -61,6 +61,13 @@ AC_ARG_ENABLE(
|
|
AC_COMPILE_WARNINGS
|
|
)
|
|
|
|
+AC_ARG_ENABLE(
|
|
+ [doc],
|
|
+ [--enable-doc enable documentation],
|
|
+ [enable_doc=$enableval],
|
|
+ [enable_doc=yes])
|
|
+AM_CONDITIONAL(ENABLE_DOC, test x"$enable_doc" = xyes)
|
|
+
|
|
AC_ARG_WITH(
|
|
[gengen],
|
|
[ --with-gengen=mygengen gengen to use],
|
|
--
|
|
cgit v1.1
|
|
|