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>

diff --git a/CHANGES b/CHANGES
index 77ceee0413bc9febba4bfdbb8f7e65424c18ea12..e5902894eea7d4854af942b7740b9a4a80265739 100644 (file)
--- 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 (file)
index 0000000..47bdd3d
--- /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 7f2e3331535c03d560e645f9978c70652ff0a4aa..d713b6dbf5d9f83ab3fbb2bf0bbcc1b07c96fcad 100644 (file)
--- 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