Merge from bittboy/buildroot@26c91a9

2025-09-27 22:24:19 +03:00 · 2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
--- a/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
+++ b/package/gengetopt/0001-configure.ac-add-disable-doc-option.patch
@@ -0,0 +1,51 @@
+From 250bee9e02546846d70dbe88ac36bb83c6a7ebdf Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 22 Sep 2019 09:27:24 +0200
+Subject: [PATCH] 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>
+[Sent upstream: https://savannah.gnu.org/bugs/index.php?56931]
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 7 +++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index dbb5719..2db307a 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -18,6 +18,10 @@
+ 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],
+-- 
+2.23.0
+
--- a/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch
+++ b/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch
@@ -1,65 +0,0 @@
-Fix compilation warnings in generated code
-
-Patch taken from open bug report http://savannah.gnu.org/bugs/?40243
-(project gengetopt seems to be dead; no hope for a new release soon)
-
-Imported by Philippe Mariman.
-This description by Thomas De Schampheleire.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
-
-Index: gengetopt-2.22.6/src/skels/c_source.cc
-===================================================================
--- gengetopt-2.22.6.orig/src/skels/c_source.cc	2012-11-07 20:58:29.000000000 +0100
-+++ gengetopt-2.22.6/src/skels/c_source.cc	2014-11-20 12:05:02.597527761 +0100
-@@ -2424,9 +2424,12 @@
-       stream << "  FIX_UNUSED (field);";
-       stream << "\n";
-       stream << indent_str;
-+      stream << "  FIX_UNUSED (stop_char);";
-+      stream << "\n";
-+      stream << indent_str;
-+      stream << "  FIX_UNUSED (val);";
-       stream << "\n";
-       stream << indent_str;
-      stream << "  stop_char = 0;";
-       stream << "\n";
-       stream << indent_str;
-       stream << "  found = 0;";
-@@ -3981,6 +3984,12 @@
-       stream << "\n";
-       stream << indent_str;
-     }
-+  else
-+    {
-+      stream << "  FIX_UNUSED (check_required);";
-+      stream << "\n";
-+      stream << indent_str;
-+    }
-   stream << "\n";
-   stream << indent_str;
-   indent = 2;
-Index: gengetopt-2.22.6/src/skels/c_source.h_skel
-===================================================================
--- gengetopt-2.22.6.orig/src/skels/c_source.h_skel	2012-11-02 18:43:24.000000000 +0100
-+++ gengetopt-2.22.6/src/skels/c_source.h_skel	2014-11-20 12:05:22.501528424 +0100
-@@ -767,8 +767,9 @@
-   char **string_field;
- @ENDIF@
-   FIX_UNUSED (field);
-+  FIX_UNUSED (stop_char);
-+  FIX_UNUSED (val);
- 
-  stop_char = 0;
-   found = 0;
- 
-   if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given)))
-@@ -1327,6 +1328,8 @@
-     {
-       error_occurred += @parser_name@_required2 (args_info, argv[0], additional_error);
-     }
-+@ELSE@
-+  FIX_UNUSED (check_required);
- @ENDIF@
- 
-   @parser_name@_release (&local_args_info);
--- a/package/gengetopt/gengetopt.hash
+++ b/package/gengetopt/gengetopt.hash
@@ -1,2 +1,4 @@
 # Locally computed
-sha256 30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7 gengetopt-2.22.6.tar.gz
+sha256 b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac gengetopt-2.23.tar.xz
+sha256 afab96ff35204960631dc05506034f9efc01e6d696f0ac93718d6bd43512cda7 COPYING
+sha256 72a43351233d6a581f891cdfff78b7b7d5f2a12522523929c5f7e8f674c2f6fc LICENSE
--- a/package/gengetopt/gengetopt.mk
+++ b/package/gengetopt/gengetopt.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################

-GENGETOPT_VERSION = 2.22.6
+GENGETOPT_VERSION = 2.23
+GENGETOPT_SOURCE = gengetopt-$(GENGETOPT_VERSION).tar.xz
 GENGETOPT_SITE = $(BR2_GNU_MIRROR)/gengetopt
 GENGETOPT_LICENSE = GPL-3.0+
 GENGETOPT_LICENSE_FILES = COPYING LICENSE
-
-# Parallel build broken
-GENGETOPT_MAKE = $(MAKE1)
+# We're patching configure.ac
+HOST_GENGETOPT_AUTORECONF = YES

 $(eval $(host-autotools-package))