diff mbox series

[03/15] gawk: upgrade 5.3.1 -> 5.3.2

Message ID 1744073502-27695-3-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/15] curl: upgrade 8.12.1 -> 8.13.0 | expand

Commit Message

Mingyu Wang (Fujitsu) April 8, 2025, 12:51 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Add-parameter-signatures-for-getenv-and-getopt.patch
removed since it's included in 5.3.2

0001-configure.ac-re-enable-disabled-printf-features.patch
refreshed for 5.3.2`

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ter-signatures-for-getenv-and-getopt.patch | 54 -------------------
 ...c-re-enable-disabled-printf-features.patch |  8 +--
 .../gawk/{gawk_5.3.1.bb => gawk_5.3.2.bb}     |  3 +-
 3 files changed, 5 insertions(+), 60 deletions(-)
 delete mode 100644 meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch
 rename meta/recipes-extended/gawk/{gawk_5.3.1.bb => gawk_5.3.2.bb} (94%)
diff mbox series

Patch

diff --git a/meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch b/meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch
deleted file mode 100644
index 7ed615a881..0000000000
--- a/meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch
+++ /dev/null
@@ -1,54 +0,0 @@ 
-From 4a8352eeaa99bbea3461696855c973447e87abdd Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 22 Mar 2025 15:14:16 -0700
-Subject: [PATCH] Add parameter signatures for getenv() and getopt()
-
-GCC-15 complains about it when building for musl C library
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gawk/2025-03/msg00027.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- missing_d/fnmatch.c | 2 +-
- support/getopt.c    | 2 +-
- support/getopt.h    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/missing_d/fnmatch.c b/missing_d/fnmatch.c
-index ccb7e34..7f97fbf 100644
---- a/missing_d/fnmatch.c
-+++ b/missing_d/fnmatch.c
-@@ -121,7 +121,7 @@ USA.  */
-    whose names are inconsistent.  */
- 
- # if !defined _LIBC && !defined getenv
--extern char *getenv ();
-+extern char *getenv (const char*);
- # endif
- 
- # ifndef errno
-diff --git a/support/getopt.c b/support/getopt.c
-index eeb71ba..e7ebd19 100644
---- a/support/getopt.c
-+++ b/support/getopt.c
-@@ -152,7 +152,7 @@ static struct _getopt_data getopt_data;
-    whose names are inconsistent.  */
- 
- #ifndef getenv
--extern char *getenv ();
-+extern char *getenv (const char*);
- #endif
- 
- #endif /* not __GNU_LIBRARY__ */
-diff --git a/support/getopt.h b/support/getopt.h
-index 8393569..06482cf 100644
---- a/support/getopt.h
-+++ b/support/getopt.h
-@@ -181,7 +181,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv,
- #  endif
- # endif
- #else /* not __GNU_LIBRARY__ */
--extern int getopt ();
-+extern int getopt (int,  char * const*, const char *);
- #endif /* __GNU_LIBRARY__ */
- 
- #ifndef __need_getopt
diff --git a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
index 4fe60c7cb8..bcbc569531 100644
--- a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
+++ b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
@@ -1,4 +1,4 @@ 
-From 879fb11c7c006a8533a092fb75b38d84cc570d83 Mon Sep 17 00:00:00 2001
+From 9ce3184188e3fa275fde0258a165f4446a6e80f7 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 22 Nov 2024 12:13:58 +0100
 Subject: [PATCH] configure.ac: re-enable disabled printf features
@@ -12,10 +12,10 @@  Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index cb99ffe..5fe792f 100644
+index 0ccd460..7df7e5b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -398,7 +398,7 @@ int main()
+@@ -400,7 +400,7 @@ int main()
  ])],
  	has_f_format=yes,
  	has_f_format=no,
@@ -24,7 +24,7 @@  index cb99ffe..5fe792f 100644
  )
  if test "$has_f_format" = yes
  then
-@@ -427,7 +427,7 @@ int main()
+@@ -429,7 +429,7 @@ int main()
  ])],
  	has_a_format=yes,
  	has_a_format=no,
diff --git a/meta/recipes-extended/gawk/gawk_5.3.1.bb b/meta/recipes-extended/gawk/gawk_5.3.2.bb
similarity index 94%
rename from meta/recipes-extended/gawk/gawk_5.3.1.bb
rename to meta/recipes-extended/gawk/gawk_5.3.2.bb
index 1fe2f2b2a7..833fe78bf9 100644
--- a/meta/recipes-extended/gawk/gawk_5.3.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.3.2.bb
@@ -18,10 +18,9 @@  PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
            file://run-ptest \
            file://0001-configure.ac-re-enable-disabled-printf-features.patch \
-           file://0001-Add-parameter-signatures-for-getenv-and-getopt.patch \
            "
 
-SRC_URI[sha256sum] = "fa41b3a85413af87fb5e3a7d9c8fa8d4a20728c67651185bb49c38a7f9382b1e"
+SRC_URI[sha256sum] = "8639a1a88fb411a1be02663739d03e902a6d313b5c6fe024d0bfeb3341a19a11"
 
 inherit autotools gettext texinfo update-alternatives