diff options
Diffstat (limited to 'meta/recipes-extended/gawk/gawk')
3 files changed, 44 insertions, 36 deletions
diff --git a/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch b/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch deleted file mode 100644 index ca0d668ce9..0000000000 --- a/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 207b94e37c84007b294e57878c913271aad544ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 11 Nov 2020 23:13:23 -0800 | ||
4 | Subject: [PATCH] Use cross AR during compile | ||
5 | |||
6 | If AR is specifcied then it should be used instead of defaulting to 'ar' | ||
7 | from host | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 7 +++++++ | ||
13 | 1 file changed, 7 insertions(+) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 31364ab..4804f7b 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -92,6 +92,13 @@ GAWK_CANONICAL_HOST | ||
20 | AC_USE_SYSTEM_EXTENSIONS | ||
21 | |||
22 | dnl checks for programs | ||
23 | +m4_ifndef([AC_PROG_AR],[dnl | ||
24 | + AN_MAKEVAR([AR], [AC_PROG_AR]) | ||
25 | + AN_PROGRAM([ar], [AC_PROG_AR]) | ||
26 | + AC_DEFUN([AC_PROG_AR], | ||
27 | + [AC_CHECK_TOOL(AR, ar, :)]) | ||
28 | +]) | ||
29 | +AC_PROG_AR | ||
30 | AC_PROG_EGREP | ||
31 | AC_PROG_YACC | ||
32 | AC_PROG_LN_S | ||
33 | -- | ||
34 | 2.29.2 | ||
35 | |||
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 new file mode 100644 index 0000000000..5be2fd97ee --- /dev/null +++ b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 4f4e84f139e2a8682f1374a592f2636c43ad857b Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 21 May 2024 15:10:11 +0000 | ||
4 | Subject: [PATCH] m4/readline: add missing includes | ||
5 | |||
6 | The cross-specific code fragment only includes stdio.h, where the native | ||
7 | fragment also includes fcntl.h and unistd.h. This is important because | ||
8 | GCC 14.1 has made the implicit definitions an error: | ||
9 | |||
10 | conftest.c: In function 'main': | ||
11 | conftest.c:144:9: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration] | ||
12 | conftest.c:146:14: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] | ||
13 | |||
14 | Add the missing includes so that the check doesn't always fail due to | ||
15 | these errors. | ||
16 | |||
17 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gawk/2024-05/msg00000.html] | ||
18 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
19 | --- | ||
20 | m4/readline.m4 | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/m4/readline.m4 b/m4/readline.m4 | ||
24 | index 38f96326..efd52d4e 100644 | ||
25 | --- a/m4/readline.m4 | ||
26 | +++ b/m4/readline.m4 | ||
27 | @@ -66,6 +66,8 @@ dnl action if false: | ||
28 | dnl action if cross compiling: | ||
29 | [AC_LINK_IFELSE( | ||
30 | [AC_LANG_PROGRAM([[#include <stdio.h> | ||
31 | +#include <fcntl.h> | ||
32 | +#include <unistd.h> | ||
33 | #include <readline/readline.h> | ||
34 | #include <readline/history.h>]], dnl includes | ||
35 | dnl function body | ||
36 | -- | ||
37 | 2.34.1 | ||
38 | |||
diff --git a/meta/recipes-extended/gawk/gawk/run-ptest b/meta/recipes-extended/gawk/gawk/run-ptest index f67a95874f..f4ef3e7bd4 100644 --- a/meta/recipes-extended/gawk/gawk/run-ptest +++ b/meta/recipes-extended/gawk/gawk/run-ptest | |||
@@ -2,7 +2,12 @@ | |||
2 | 2 | ||
3 | cd test | 3 | cd test |
4 | for i in `grep -E "^[a-z0-9_-]*:$" Maketests |awk -F: '{print $1}'`; do | 4 | for i in `grep -E "^[a-z0-9_-]*:$" Maketests |awk -F: '{print $1}'`; do |
5 | #LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} | 5 | unset LANG |
6 | grep -q "^$i$" skipped.txt | ||
7 | if [ $? -eq 0 ]; then | ||
8 | echo "SKIP: $i" | ||
9 | continue | ||
10 | fi | ||
6 | srcdir=`pwd` AWKPROG=gawk AWK=gawk CMP=cmp make -f Maketests $i >$i.tmp 2>&1 | 11 | srcdir=`pwd` AWKPROG=gawk AWK=gawk CMP=cmp make -f Maketests $i >$i.tmp 2>&1 |
7 | if [ -e _$i ]; then | 12 | if [ -e _$i ]; then |
8 | cat _$i | 13 | cat _$i |