gawk: bump to version 4.1.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/gawk/Config.in b/package/gawk/Config.in
index 82c970f1dfc2ac25382171afa47475b8032e3c64..6889777c0df4687db37f65f028bc9b24ecedb758 100644 (file)
--- a/package/gawk/Config.in
+++ b/package/gawk/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_GAWK
        bool "gawk"
        depends on BR2_USE_WCHAR
+       depends on BR2_USE_MMU # fork()
+       depends on !BR2_PREFER_STATIC_LIB
        help
          A special-purpose programming language which is data driven
          rather than procedural.  Allows for simple data-reformatting jobs

diff --git a/package/gawk/gawk-01-no-versioned.patch b/package/gawk/gawk-01-no-versioned.patch
new file mode 100644 (file)
index 0000000..ff28581
--- /dev/null
+++ b/package/gawk/gawk-01-no-versioned.patch
@@ -0,0 +1,26 @@
+Disabled versioned installation of binaries to save space.
+Also use symlinks where it's appropiate.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura gawk-4.0.0.orig/Makefile.in gawk-4.0.0/Makefile.in
+--- gawk-4.0.0.orig/Makefile.in        2011-06-24 05:16:13.000000000 -0300
++++ gawk-4.0.0/Makefile.in     2011-11-11 15:31:16.429577288 -0300
+@@ -403,7 +403,7 @@
+ MAINTAINERCLEANFILES = version.c
+ 
+ # We want hard links for install-exec-hook, below
+-LN = ln
++LN = $(LN_S)
+ all: config.h
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -1011,6 +1011,7 @@
+ # (This is done universally, which may not always be right, but
+ # there's no easy way to distinguish GNU from non-GNU systems.)
+ install-exec-hook:
++foo:
+       (cd $(DESTDIR)$(bindir); \
+       $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+       $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \

diff --git a/package/gawk/gawk-no-versioned.patch b/package/gawk/gawk-no-versioned.patch
deleted file mode 100644 (file)
index ff28581..0000000
--- a/package/gawk/gawk-no-versioned.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disabled versioned installation of binaries to save space.
-Also use symlinks where it's appropiate.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-
-diff -Nura gawk-4.0.0.orig/Makefile.in gawk-4.0.0/Makefile.in
---- gawk-4.0.0.orig/Makefile.in        2011-06-24 05:16:13.000000000 -0300
-+++ gawk-4.0.0/Makefile.in     2011-11-11 15:31:16.429577288 -0300
-@@ -403,7 +403,7 @@
- MAINTAINERCLEANFILES = version.c
- 
- # We want hard links for install-exec-hook, below
--LN = ln
-+LN = $(LN_S)
- all: config.h
-       $(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -1011,6 +1011,7 @@
- # (This is done universally, which may not always be right, but
- # there's no easy way to distinguish GNU from non-GNU systems.)
- install-exec-hook:
-+foo:
-       (cd $(DESTDIR)$(bindir); \
-       $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-       $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 366dea78fabe478cf200b64a820a6a649c597530..b26430e57004d1ffc8fa93d7bb52677c58135856 100644 (file)
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-GAWK_VERSION = 4.0.1
+GAWK_VERSION = 4.1.0
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
-GAWK_TARGET_BINS = awk gawk igawk pgawk
-GAWK_LICENSE = GPLv3
+GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr)
+GAWK_LICENSE = GPLv3+
 GAWK_LICENSE_FILES = COPYING
 
 # Prefer full-blown gawk over busybox awk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 GAWK_DEPENDENCIES += busybox
 endif
 
-# we don't have a host-busybox
+# We don't have a host-busybox
 HOST_GAWK_DEPENDENCIES =
 
 define GAWK_CREATE_SYMLINK
@@ -24,13 +24,13 @@ endef
 
 GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK
 
-define GAWK_UNINSTALL_TARGET_CMDS
-       rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(GAWK_TARGET_BINS))
-       rm -f $(TARGET_DIR)/usr/share/info/gawk*.info
-       rm -f $(TARGET_DIR)/usr/share/man/man*/*gawk.1
-       rm -rf $(TARGET_DIR)/usr/libexec/awk
-       rm -rf $(TARGET_DIR)/usr/share/awk
+# Assume we support shared libs
+# The check isn't cross-compile friendly and it's mandatory anyway
+define GAWK_DISABLE_SHARED_CHECK
+       $(SED) 's/ check-for-shared-lib-support//' $(@D)/extension/Makefile.in
 endef
 
+GAWK_POST_PATCH_HOOKS += GAWK_DISABLE_SHARED_CHECK
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))