summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-11-19 23:36:37 -0500
committerPeter Korsgaard <jacmet@sunsite.dk>2010-12-06 23:16:06 +0100
commit0d8c87560180723e6a140a71e8871986caa244f3 (patch)
treef78971442f27ae4fc369ba19b2d307394dd1e8ab
parent9de2a8513e34da0b4e8cd4ea542ee1d449989a8c (diff)
m4: version bump to 1.4.15
And include patch from OE for building on uClibc targets. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/m4/m4-1.4.15-uclibc-sched_param-def.patch19
-rw-r--r--package/m4/m4.mk2
3 files changed, 21 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 77ceee041..e5902894e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
2011.02, Not yet released:
- Updated/fixed packages: cloop
+ Updated/fixed packages: cloop, m4
2010.11, Released November 30th, 2010:
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
new file mode 100644
index 000000000..47bdd3d84
--- /dev/null
+++ b/package/m4/m4-1.4.15-uclibc-sched_param-def.patch
@@ -0,0 +1,19 @@
+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.mk b/package/m4/m4.mk
index 7f2e33315..d713b6dbf 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -3,7 +3,7 @@
# m4
#
#############################################################
-M4_VERSION = 1.4.9
+M4_VERSION = 1.4.15
M4_SOURCE = m4-$(M4_VERSION).tar.bz2
M4_SITE = $(BR2_GNU_MIRROR)/m4