Skip to content

Commit a8b788e

Browse files
ffontainetpetazzoni
authored andcommitted
package/gengetopt: fix patch fuzz
Use upstream patch to fix patch fuzz and avoid the following build failure raised since commit 8f88a64 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 <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
1 parent 8637884 commit a8b788e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.checkpackageignore

-1
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ package/gdb/15.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.U
604604
package/gdb/15.1/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream
605605
package/gdb/15.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream
606606
package/gdb/15.1/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream
607-
package/gengetopt/0001-configure.ac-add-disable-doc-option.patch lib_patch.Upstream
608607
package/genpart/0001-fix-return-code.patch lib_patch.Upstream
609608
package/genromfs/0001-build-system.patch lib_patch.Sob lib_patch.Upstream
610609
package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch lib_patch.Upstream

package/gengetopt/0001-configure.ac-add-disable-doc-option.patch

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
From 250bee9e02546846d70dbe88ac36bb83c6a7ebdf Mon Sep 17 00:00:00 2001
1+
From e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <[email protected]>
33
Date: Sun, 22 Sep 2019 09:27:24 +0200
4-
Subject: [PATCH] configure.ac: add --disable-doc option
4+
Subject: configure.ac: add --disable-doc option
55

66
Add --disable-doc option to allow the user to disable documentation
77

88
Signed-off-by: Fabrice Fontaine <[email protected]>
9-
[Sent upstream: https://savannah.gnu.org/bugs/index.php?56931]
9+
Upstream: https://git.savannah.gnu.org/cgit/gengetopt.git/commit/?id=e3fe8db2b67cdb18e1a2a6765644c8cc476d0b0a
1010
---
1111
Makefile.am | 6 +++++-
1212
configure.ac | 7 +++++++
1313
2 files changed, 12 insertions(+), 1 deletion(-)
1414

1515
diff --git a/Makefile.am b/Makefile.am
16-
index dbb5719..2db307a 100644
16+
index 1f184c2..76ac21a 100644
1717
--- a/Makefile.am
1818
+++ b/Makefile.am
19-
@@ -18,6 +18,10 @@
19+
@@ -18,7 +18,11 @@
2020
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
2121

2222
EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
@@ -28,6 +28,7 @@ index dbb5719..2db307a 100644
2828
+endif
2929

3030
gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
31+
3132
diff --git a/configure.ac b/configure.ac
3233
index 0ee89db..915706c 100644
3334
--- a/configure.ac
@@ -47,5 +48,5 @@ index 0ee89db..915706c 100644
4748
[gengen],
4849
[ --with-gengen=mygengen gengen to use],
4950
--
50-
2.23.0
51+
cgit v1.1
5152

0 commit comments

Comments
 (0)