summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-11-13 19:27:54 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-11-14 09:29:49 +0100
commit3e70816f54c987060bb3f5deabfa7dec7713ab25 (patch)
tree040e3d897434792aa0a3034c71ab4d111650508e
parenta0f4ddfbe02a2eec7f6f2158d3258a511a55bf56 (diff)
m4: bump to version 1.4.16
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/m4/m4-1.4.15-uclibc-sched_param-def.patch19
-rw-r--r--package/m4/m4-1.4.16-001-MB_CUR_MAX.patch (renamed from package/m4/m4-1.4.8-001-MB_CUR_MAX.patch)0
-rw-r--r--package/m4/m4.mk4
3 files changed, 2 insertions, 21 deletions
diff --git a/package/m4/m4-1.4.15-uclibc-sched_param-def.patch b/package/m4/m4-1.4.15-uclibc-sched_param-def.patch
deleted file mode 100644
index 47bdd3d84..000000000
--- a/package/m4/m4-1.4.15-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-Index: m4-1.4.14/lib/spawn.in.h
-===================================================================
---- m4-1.4.14.orig/lib/spawn.in.h 2010-06-01 14:27:59.394242980 -0700
-+++ m4-1.4.14/lib/spawn.in.h 2010-06-01 14:28:28.202332200 -0700
-@@ -31,7 +31,7 @@
-
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
- But avoid namespace pollution on glibc systems. */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/package/m4/m4-1.4.8-001-MB_CUR_MAX.patch b/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
index fce36731b..fce36731b 100644
--- a/package/m4/m4-1.4.8-001-MB_CUR_MAX.patch
+++ b/package/m4/m4-1.4.16-001-MB_CUR_MAX.patch
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index 4f18aa47c..173bba85c 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -3,10 +3,10 @@
# m4
#
#############################################################
-M4_VERSION = 1.4.15
+
+M4_VERSION = 1.4.16
M4_SOURCE = m4-$(M4_VERSION).tar.bz2
M4_SITE = $(BR2_GNU_MIRROR)/m4
-
M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
ifneq ($(BR2_USE_WCHAR),y)