Add patch from OE to fix building with uClibc #336484 by Andrew Frink.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 44 insertions, 5 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 3a58f0ba1af2..7678d5130647 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.140 2010/09/06 20:26:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.141 2010/11/20 04:28:42 vapier Exp $
+
+  20 Nov 2010; Mike Frysinger <vapier@gentoo.org> m4-1.4.15.ebuild,
+  +files/m4-1.4.15-uclibc-sched_param-def.patch:
+  Add patch from OE to fix building with uClibc #336484 by Andrew Frink.
 
   06 Sep 2010; Brent Baude <ranger@gentoo.org> m4-1.4.14-r1.ebuild:
   Marking m4-1.4.14-r1 ppc64 for bug 307633
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 7c50cca67c8a..3cd334f3279f 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX m4-1.4.14-glibc-2.12.patch 1941 RMD160 ecd68b2eda12fb66b3fd7b356500e7f96c0b29e1 SHA1 7f8223986057827e270d5108f41ca989e13fb81f SHA256 0e8cf2caca722cd9f897da5cdaa80e160931a020d768af6c4aaa1b79b72d948a
 AUX m4-1.4.14-gnulib_spawn.patch 1316 RMD160 ffd509b614c42fb8826ff9a04b9f58c564b8854c SHA1 04402c26d6e685eac0a7f6fdf29fec09dfb5d2ca SHA256 0dbe9373f4844bed1e35ed289ae293d3440421e2d7d1ec92b8c10fcfc4b4fca1
+AUX m4-1.4.15-uclibc-sched_param-def.patch 580 RMD160 2bcea0eb33aaef5ae5f9046a36385af7a9194865 SHA1 e3c94913eaaf8a280e598353f89ef46119dd3f94 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9
 DIST m4-1.4.12.tar.lzma 768167 RMD160 0a510ac65fb0a0005a574b6d1dcf4a86718fd7af SHA1 ea93f11df1098e1ced67255c7a66b817bd29daef SHA256 a5caedee843ad8fc418fb5228da057156134ca4132eb850d1e9a3d7838477f46
 DIST m4-1.4.14.tar.bz2 1125670 RMD160 d4145f84b629772d9e5bd8fd893f3633d26071a9 SHA1 f2df9a3db6bb3974f06e5cefe04b9ce3f4bf8b82 SHA256 0885ffa93256353a96b1cf0bcbc4d639ed09953b687e6cc412c4048e656f4dd2
 DIST m4-1.4.15.tar.xz 947068 RMD160 a51516c6e22d3518eabb934083a6d450d85190e2 SHA1 d4c7fe695ddf93c0f05c6435d892520b65f4c0d7 SHA256 ec26b4ef8037286b36bc5af9893f0da63bf8615bbf478a587aa6cab927b0349d
 EBUILD m4-1.4.12.ebuild 1134 RMD160 420b49b4173e23cc02ea717354524485fcbfc7d7 SHA1 291cea0647427b5e0debf395e595f1c3f6fbc98f SHA256 553aac4e1daf6011f1871e4782f752418b2807746a2b1204fd0d65a2488f786d
 EBUILD m4-1.4.14-r1.ebuild 1322 RMD160 a058f7c04034aa97567fa5c810362a75d97f4a9c SHA1 9f586a8e97d0cacce7d2f4b9ad927b342d8f71dc SHA256 268723b65a84390b9360ee152cb7f07e5db2c0e0530448b28f6ad3c26a89faa2
-EBUILD m4-1.4.15.ebuild 1189 RMD160 37c0457381443c43916124ac8cf4264ad9d3545d SHA1 5b875f3195cd46efbd27ba1bc92e43ee34c87c9a SHA256 73fe6935fb6a6f642d255561ccd90d2a6018329edcf5bc43e6bc9501e74e06f6
-MISC ChangeLog 15677 RMD160 6ac49c809934ec9d0863d09ffc54c4657fd47467 SHA1 9a3662ae18ff9e043c55c00fdc7b8c16f6f82038 SHA256 9e23179f7398e10f257f4312db22095aced21aae5a21ccca35e89e560740a8a3
+EBUILD m4-1.4.15.ebuild 1244 RMD160 ee820f918c9f9d2d06b94d0594bda4974f14bad7 SHA1 ab14624aa10da690c4bfef570fa5a1917b3de207 SHA256 fdc0be3278b9b7047eda1c0aa50e39c14942376f3aded2af4fe35306acf15b72
+MISC ChangeLog 15868 RMD160 1d04908481ea35e874c43d6b76917f091ad640ee SHA1 4d66db549966e3cb21b833641efa397d19d709e0 SHA256 d0d108d659c8ddd3ddd3b9aeb65ec4661c75ab477cd59bb0267d229db590b04d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkznThIACgkQTwhj9JtAlp6SkAD/b71ADkQi4NmigJXAc70O5Fxt
+W3wU7MFLzqyM2e7HMbYBAJsZ67UH58UqCTiHGwmKlRkwMAYfOKlCtlzJtz60G/5G
+=7HnF
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/m4/files/m4-1.4.15-uclibc-sched_param-def.patch b/sys-devel/m4/files/m4-1.4.15-uclibc-sched_param-def.patch
new file mode 100644
index 000000000000..50652d8babc2
--- /dev/null
+++ b/sys-devel/m4/files/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
+
+http://bugs.gentoo.org/336484
+
+--- m4-1.4.14/lib/spawn.in.h
++++ m4-1.4.14/lib/spawn.in.h
+@@ -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/sys-devel/m4/m4-1.4.15.ebuild b/sys-devel/m4/m4-1.4.15.ebuild
index 0cfa0ddd4755..a0e1c4f0f007 100644
--- a/sys-devel/m4/m4-1.4.15.ebuild
+++ b/sys-devel/m4/m4-1.4.15.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.15.ebuild,v 1.1 2010/08/31 17:50:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.15.ebuild,v 1.2 2010/11/20 04:28:42 vapier Exp $
 
 EAPI="3"
 
+inherit eutils
+
 DESCRIPTION="GNU macro processor"
 HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
@@ -17,6 +19,10 @@ IUSE="examples"
 DEPEND="app-arch/xz-utils"
 RDEPEND=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch #336484
+}
+
 src_configure() {
 	# Disable automagic dependency over libsigsegv; see bug #278026
 	export ac_cv_libsigsegv=no
@@ -39,5 +45,4 @@ src_install() {
 		dodoc examples/*
 		rm -f "${D}"/usr/share/doc/${PF}/examples/Makefile*
 	fi
-	rm -f "${D}"/usr/lib/charset.alias #172864
 }