Add gnulib sched fix from upstream for uClibc builds #323377 by Maksim Melnikau. Add elibtoolize for cross-compiling peeps #260794 by Andrei Slavoiu.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 31 insertions, 4 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 1a45cff31c9a..7c78181e924b 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.193 2011/04/08 19:40:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.194 2011/09/07 02:28:56 vapier Exp $
+
+  07 Sep 2011; Mike Frysinger <vapier@gentoo.org> gettext-0.18.1.1-r2.ebuild,
+  +files/gettext-0.18.1.1-uclibc-sched_param-def.patch:
+  Add gnulib sched fix from upstream for uClibc builds #323377 by Maksim
+  Melnikau. Add elibtoolize for cross-compiling peeps #260794 by Andrei
+  Slavoiu.
 
   08 Apr 2011; Petteri Räty <betelgeuse@gentoo.org>
   gettext-0.18.1.1-r2.ebuild:
diff --git a/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch b/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch
new file mode 100644
index 000000000000..4e392780fc65
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch
@@ -0,0 +1,20 @@
+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
+http://bugs.gentoo.org/323377
+
+--- gettext/gettext-tools/gnulib-lib/spawn.in.h
++++ gettext/gettext-tools/gnulib-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/gettext/gettext-0.18.1.1-r2.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
index 60a8314c0773..37690a5d9ad7 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild,v 1.2 2011/04/08 19:40:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild,v 1.3 2011/09/07 02:28:56 vapier Exp $
 
 EAPI="2"
 
@@ -12,8 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
-~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl doc emacs +git java nls nocxx openmp elibc_glibc"
 
 DEPEND="virtual/libiconv
@@ -30,6 +29,8 @@ PDEPEND="emacs? ( app-emacs/po-mode )"
 src_prepare() {
 	java-pkg-opt-2_src_prepare
 	epunt_cxx
+	elibtoolize
+	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
 }
 
 src_configure() {