diff options
Diffstat (limited to 'recipes-extended/gawk')
3 files changed, 152 insertions, 0 deletions
diff --git a/recipes-extended/gawk/gawk-3.1.5/0001-gawk-fix-non-glibc-gcc-4-compilation.patch b/recipes-extended/gawk/gawk-3.1.5/0001-gawk-fix-non-glibc-gcc-4-compilation.patch new file mode 100644 index 0000000..bc9201b --- /dev/null +++ b/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/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch b/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch new file mode 100644 index 0000000..c42c33c --- /dev/null +++ b/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch @@ -0,0 +1,41 @@ +Upstream-Status: Pending + +automake 1.12 has depricated automatic de-ANSI-fication support + +this patch avoids these kinds of errors: + +| configure.ac:127: error: automatic de-ANSI-fication support has been removed +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:12: AM_C_PROTOTYPES is expanded from... +| configure.ac:127: the top level +| autom4te: m4 failed with exit status: 1 +... +| Makefile.am:27: error: automatic de-ANSI-fication support has been removed + +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> +2012/05/04 + +Index: gawk-3.1.5/configure.ac +=================================================================== +--- gawk-3.1.5.orig/configure.ac ++++ gawk-3.1.5/configure.ac +@@ -124,7 +124,6 @@ fi + + dnl check for C compiler for automake + AM_PROG_CC_STDC +-AM_C_PROTOTYPES + + dnl Cygwin doesn't like to get libs with full paths + dnl since that overrides linking against DLLs. +Index: gawk-3.1.5/Makefile.am +=================================================================== +--- gawk-3.1.5.orig/Makefile.am ++++ gawk-3.1.5/Makefile.am +@@ -24,7 +24,7 @@ + ## process this file with automake to produce Makefile.in + + # Automatic de-ANSI-fication if needed, make .bz2 files also. +-AUTOMAKE_OPTIONS = ansi2knr dist-bzip2 ++AUTOMAKE_OPTIONS = dist-bzip2 + + # This undocumented variable insures that aclocal runs + # correctly after changing configure.ac diff --git a/recipes-extended/gawk/gawk_3.1.5.bb b/recipes-extended/gawk/gawk_3.1.5.bb new file mode 100644 index 0000000..63fd32f --- /dev/null +++ b/recipes-extended/gawk/gawk_3.1.5.bb @@ -0,0 +1,44 @@ +SUMMARY = "GNU awk text processing utility" +DESCRIPTION = "The GNU version of awk, a text processing utility. \ +Awk interprets a special-purpose programming language to do \ +quick and easy text pattern matching and reformatting jobs." +HOMEPAGE = "www.gnu.org/software/gawk" +BUGTRACKER = "bug-gawk@gnu.org" +SECTION = "console/utils" + +# gawk <= 3.1.5: GPLv2 +# gawk >= 3.1.6: GPLv3 +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +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 \ + file://0001-gawk-fix-non-glibc-gcc-4-compilation.patch \ +" + +SRC_URI[md5sum] = "4760325489479cac17fe0114b8f62f30" +SRC_URI[sha256sum] = "463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8" + +inherit autotools gettext texinfo update-alternatives + +PACKAGES += "gawk-common pgawk" + +FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk" +FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*" +FILES_pgawk = "${bindir}/pgawk*" + +ALTERNATIVE_${PN} = "awk" +ALTERNATIVE_TARGET[awk] = "${bindir}/gawk" +ALTERNATIVE_PRIORITY = "100" + +CFLAGS += "-D PROTOTYPES" + +do_install_append() { + # remove the link since we don't package it + rm ${D}${bindir}/awk +} |