diff options
Diffstat (limited to 'meta/recipes-extended/gawk')
| -rw-r--r-- | meta/recipes-extended/gawk/gawk-3.1.5/0001-gawk-fix-non-glibc-gcc-4-compilation.patch | 67 | ||||
| -rw-r--r-- | meta/recipes-extended/gawk/gawk_3.1.5.bb | 7 |
2 files changed, 72 insertions, 2 deletions
diff --git a/meta/recipes-extended/gawk/gawk-3.1.5/0001-gawk-fix-non-glibc-gcc-4-compilation.patch b/meta/recipes-extended/gawk/gawk-3.1.5/0001-gawk-fix-non-glibc-gcc-4-compilation.patch new file mode 100644 index 0000000000..bc9201b631 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk-3.1.5/0001-gawk-fix-non-glibc-gcc-4-compilation.patch @@ -0,0 +1,67 @@ +From 53496e2e306b16ac59801553f775bcca164e6a39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Wed, 14 Sep 2016 16:20:37 +0100 +Subject: [PATCH] fix gcc >= 4 compilation + +| ../gawk-3.1.5/hard-locale.h: In function 'hard_locale': +| ../gawk-3.1.5/hard-locale.h:43:20: error: invalid storage class for function 'xmalloc' +| static ptr_t xmalloc PARAMS ((size_t n)); +| ^~~~~~~ + +| ../gawk-3.1.5/hard-locale.h:45:22: warning: implicit declaration of function 'xmalloc' [-Wimplicit-function-declaration] +| char *locale = xmalloc (strlen (p) + 1); +| ^~~~~~~ +| ../gawk-3.1.5/hard-locale.h:45:22: warning: initialization makes pointer from integer without a cast [-Wint-conversion] +| ../gawk-3.1.5/dfa.c: At top level: +| ../gawk-3.1.5/dfa.c:125:14: error: conflicting types for 'xmalloc' +| static ptr_t xmalloc PARAMS ((size_t n)); +| ^~~~~~~ +| In file included from ../gawk-3.1.5/dfa.c:112:0: +| ../gawk-3.1.5/hard-locale.h:45:22: note: previous implicit declaration of 'xmalloc' was here +| char *locale = xmalloc (strlen (p) + 1); +| ^~~~~~~ + +Upstream-Status: Inappropriate [required for gawk 3.1.5 (GPLv2) recipe only] + +Signed-off-by: André Draszik <git@andred.net> +--- + dfa.c | 2 +- + hard-locale.h | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/dfa.c b/dfa.c +index 71e3736..97f6045 100644 +--- a/dfa.c ++++ b/dfa.c +@@ -109,6 +109,7 @@ extern void free(); + + #include "regex.h" + #include "dfa.h" ++static ptr_t xmalloc PARAMS ((size_t n)); + #include "hard-locale.h" + + /* HPUX, define those as macros in sys/param.h */ +@@ -122,7 +123,6 @@ extern void free(); + static void dfamust PARAMS ((struct dfa *dfa)); + + static ptr_t xcalloc PARAMS ((size_t n, size_t s)); +-static ptr_t xmalloc PARAMS ((size_t n)); + static ptr_t xrealloc PARAMS ((ptr_t p, size_t n)); + #ifdef DEBUG + static void prtok PARAMS ((token t)); +diff --git a/hard-locale.h b/hard-locale.h +index 0f4986b..9ee57e0 100644 +--- a/hard-locale.h ++++ b/hard-locale.h +@@ -40,8 +40,6 @@ hard_locale (int category) + if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0) + hard = 0; + # else +- static ptr_t xmalloc PARAMS ((size_t n)); +- + char *locale = xmalloc (strlen (p) + 1); + strcpy (locale, p); + +-- +2.9.3 + diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb index 7c92bded3e..63fd32f4b9 100644 --- a/meta/recipes-extended/gawk/gawk_3.1.5.bb +++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb @@ -15,8 +15,11 @@ RDEPENDS_gawk += "gawk-common" RDEPENDS_pgawk += "gawk-common" PR = "r2" -SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ - file://gawk-3.1.5_fix_for_automake-1.12.patch" +SRC_URI = "\ + ${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ + file://gawk-3.1.5_fix_for_automake-1.12.patch \ + file://0001-gawk-fix-non-glibc-gcc-4-compilation.patch \ +" SRC_URI[md5sum] = "4760325489479cac17fe0114b8f62f30" SRC_URI[sha256sum] = "463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8" |