diff mbox series

[08/35] gawk: upgrade 5.3.0 -> 5.3.1

Message ID 20241125120127.2205232-8-alex.kanavin@gmail.com
State Accepted, archived
Commit 96240d86955b51f9a494bd46ce064a7517aac7ab
Headers show
Series [01/35] alsa: upgrade 1.2.12 -> 1.2.13 | expand

Commit Message

Alexander Kanavin Nov. 25, 2024, 12:01 p.m. UTC
From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...c-re-enable-disabled-printf-features.patch | 35 +++++++++++++++++
 ...001-m4-readline-add-missing-includes.patch | 38 -------------------
 .../gawk/{gawk_5.3.0.bb => gawk_5.3.1.bb}     |  4 +-
 3 files changed, 37 insertions(+), 40 deletions(-)
 create mode 100644 meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
 delete mode 100644 meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
 rename meta/recipes-extended/gawk/{gawk_5.3.0.bb => gawk_5.3.1.bb} (94%)

Comments

Khem Raj Nov. 25, 2024, 6:36 p.m. UTC | #1
On Mon, Nov 25, 2024 at 4:02 AM Alexander Kanavin via lists.openembedded.org
<alex.kanavin=gmail.com@lists.openembedded.org> wrote:

> From: Alexander Kanavin <alex@linutronix.de>
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...c-re-enable-disabled-printf-features.patch | 35 +++++++++++++++++
>  ...001-m4-readline-add-missing-includes.patch | 38 -------------------
>  .../gawk/{gawk_5.3.0.bb => gawk_5.3.1.bb}     |  4 +-
>  3 files changed, 37 insertions(+), 40 deletions(-)
>  create mode 100644
> meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
>  delete mode 100644
> meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
>  rename meta/recipes-extended/gawk/{gawk_5.3.0.bb => gawk_5.3.1.bb} (94%)
>
> 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
> new file mode 100644
> index 00000000000..4fe60c7cb83
> --- /dev/null
> +++
> b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
> @@ -0,0 +1,35 @@
> +From 879fb11c7c006a8533a092fb75b38d84cc570d83 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
> +
> +This is needed for ptests to pass for one thing.
> +
> +Upstream-Status: Inappropriate [needs a config option]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + configure.ac | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index cb99ffe..5fe792f 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -398,7 +398,7 @@ int main()
> + ])],
> +       has_f_format=yes,
> +       has_f_format=no,
> +-      has_f_format=no  dnl Cross-compiling, assuming the worst.
> ++      has_f_format=yes  dnl Cross-compiling in oe-core


Does this work if you pass is via EXTRA_OECONF


> + )
> + if test "$has_f_format" = yes
> + then
> +@@ -427,7 +427,7 @@ int main()
> + ])],
> +       has_a_format=yes,
> +       has_a_format=no,
> +-      has_a_format=no  dnl Cross-compiling, assuming the worst.
> ++      has_a_format=yes  dnl Cross-compiling in oe-core
> + )
> + if test "$has_a_format" = yes
> + then
> diff --git
> a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
> b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
> deleted file mode 100644
> index 6fffd1f373a..00000000000
> ---
> a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From 4f4e84f139e2a8682f1374a592f2636c43ad857b Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@arm.com>
> -Date: Tue, 21 May 2024 15:10:11 +0000
> -Subject: [PATCH] m4/readline: add missing includes
> -
> -The cross-specific code fragment only includes stdio.h, where the native
> -fragment also includes fcntl.h and unistd.h.  This is important because
> -GCC 14.1 has made the implicit definitions an error:
> -
> -conftest.c: In function 'main':
> -conftest.c:144:9: error: implicit declaration of function 'close'; did
> you mean 'pclose'? [-Wimplicit-function-declaration]
> -conftest.c:146:14: error: implicit declaration of function 'open'; did
> you mean 'popen'? [-Wimplicit-function-declaration]
> -
> -Add the missing includes so that the check doesn't always fail due to
> -these errors.
> -
> -Upstream-Status: Backport [
> https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140
> ]
> -Signed-off-by: Ross Burton <ross.burton@arm.com>
> ----
> - m4/readline.m4 | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/m4/readline.m4 b/m4/readline.m4
> -index 38f96326..efd52d4e 100644
> ---- a/m4/readline.m4
> -+++ b/m4/readline.m4
> -@@ -66,6 +66,8 @@ dnl action if false:
> - dnl action if cross compiling:
> -               [AC_LINK_IFELSE(
> -                       [AC_LANG_PROGRAM([[#include <stdio.h>
> -+#include <fcntl.h>
> -+#include <unistd.h>
> - #include <readline/readline.h>
> - #include <readline/history.h>]],              dnl includes
> -                       dnl function body
> ---
> -2.34.1
> -
> diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb
> b/meta/recipes-extended/gawk/gawk_5.3.1.bb
> similarity index 94%
> rename from meta/recipes-extended/gawk/gawk_5.3.0.bb
> rename to meta/recipes-extended/gawk/gawk_5.3.1.bb
> index ac9d8500d60..bd72fbf2808 100644
> --- a/meta/recipes-extended/gawk/gawk_5.3.0.bb
> +++ b/meta/recipes-extended/gawk/gawk_5.3.1.bb
> @@ -16,11 +16,11 @@ PACKAGECONFIG[readline] =
> "--with-readline,--without-readline,readline"
>  PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
>
>  SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
> -           file://0001-m4-readline-add-missing-includes.patch \
>             file://run-ptest \
> +
>  file://0001-configure.ac-re-enable-disabled-printf-features.patch \
>             "
>
> -SRC_URI[sha256sum] =
> "378f8864ec21cfceaa048f7e1869ac9b4597b449087caf1eb55e440d30273336"
> +SRC_URI[sha256sum] =
> "fa41b3a85413af87fb5e3a7d9c8fa8d4a20728c67651185bb49c38a7f9382b1e"
>
>  inherit autotools gettext texinfo update-alternatives
>
> --
> 2.39.5
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#207756):
> https://lists.openembedded.org/g/openembedded-core/message/207756
> Mute This Topic: https://lists.openembedded.org/mt/109769662/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Alexander Kanavin Nov. 25, 2024, 6:54 p.m. UTC | #2
On Mon, 25 Nov 2024 at 19:36, Khem Raj <raj.khem@gmail.com> wrote:
> Does this work if you pass is via EXTRA_OECONF

No. I tried.

Alex
diff mbox series

Patch

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
new file mode 100644
index 00000000000..4fe60c7cb83
--- /dev/null
+++ b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch
@@ -0,0 +1,35 @@ 
+From 879fb11c7c006a8533a092fb75b38d84cc570d83 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
+
+This is needed for ptests to pass for one thing.
+
+Upstream-Status: Inappropriate [needs a config option]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cb99ffe..5fe792f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -398,7 +398,7 @@ int main()
+ ])],
+ 	has_f_format=yes,
+ 	has_f_format=no,
+-	has_f_format=no  dnl Cross-compiling, assuming the worst.
++	has_f_format=yes  dnl Cross-compiling in oe-core
+ )
+ if test "$has_f_format" = yes
+ then
+@@ -427,7 +427,7 @@ int main()
+ ])],
+ 	has_a_format=yes,
+ 	has_a_format=no,
+-	has_a_format=no  dnl Cross-compiling, assuming the worst.
++	has_a_format=yes  dnl Cross-compiling in oe-core
+ )
+ if test "$has_a_format" = yes
+ then
diff --git a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
deleted file mode 100644
index 6fffd1f373a..00000000000
--- a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-From 4f4e84f139e2a8682f1374a592f2636c43ad857b Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Tue, 21 May 2024 15:10:11 +0000
-Subject: [PATCH] m4/readline: add missing includes
-
-The cross-specific code fragment only includes stdio.h, where the native
-fragment also includes fcntl.h and unistd.h.  This is important because
-GCC 14.1 has made the implicit definitions an error:
-
-conftest.c: In function 'main':
-conftest.c:144:9: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration]
-conftest.c:146:14: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration]
-
-Add the missing includes so that the check doesn't always fail due to
-these errors.
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- m4/readline.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/readline.m4 b/m4/readline.m4
-index 38f96326..efd52d4e 100644
---- a/m4/readline.m4
-+++ b/m4/readline.m4
-@@ -66,6 +66,8 @@ dnl action if false:
- dnl action if cross compiling:
- 		[AC_LINK_IFELSE(
- 			[AC_LANG_PROGRAM([[#include <stdio.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- #include <readline/readline.h>
- #include <readline/history.h>]],		dnl includes
- 			dnl function body
--- 
-2.34.1
-
diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb b/meta/recipes-extended/gawk/gawk_5.3.1.bb
similarity index 94%
rename from meta/recipes-extended/gawk/gawk_5.3.0.bb
rename to meta/recipes-extended/gawk/gawk_5.3.1.bb
index ac9d8500d60..bd72fbf2808 100644
--- a/meta/recipes-extended/gawk/gawk_5.3.0.bb
+++ b/meta/recipes-extended/gawk/gawk_5.3.1.bb
@@ -16,11 +16,11 @@  PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
-           file://0001-m4-readline-add-missing-includes.patch \
            file://run-ptest \
+           file://0001-configure.ac-re-enable-disabled-printf-features.patch \
            "
 
-SRC_URI[sha256sum] = "378f8864ec21cfceaa048f7e1869ac9b4597b449087caf1eb55e440d30273336"
+SRC_URI[sha256sum] = "fa41b3a85413af87fb5e3a7d9c8fa8d4a20728c67651185bb49c38a7f9382b1e"
 
 inherit autotools gettext texinfo update-alternatives