Add gnulib sched fix from upstream for uClibc builds #323377 by Maksim Melnikau....

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

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 1a45cff31c9a4ea5ec341248b10dc272c9c282bd..7c78181e924bf5e3d93ac8e5f244523af2ddea8a 100644 (file)
--- 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/Manifest b/sys-devel/gettext/Manifest
index e9e0eb87551495668f0c25c547c1a30dd3c9a714..7f47474de18d59ce743ebd3f21c6440382e6121f 100644 (file)
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
 AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
@@ -7,6 +7,7 @@ AUX gettext-0.15-expat-no-dlopen.patch 585 RMD160 7e41b0b5b1f9a8eb220a445fde835c
 AUX gettext-0.17-gnuinfo.patch 634 RMD160 09ee57c6b9426bf0781fcd424a00b0ad389b7d89 SHA1 b0ad8cfe31752db56d8eaa82f2c55e6a81994677 SHA256 f38fb566eb1398a46ed93994d6576cd98d025d02e2ecde1f778d26956fe098a1
 AUX gettext-0.17-open-args.patch 1015 RMD160 11e344dcfa926fefe8045a08e97933722f47da31 SHA1 357ebe671577c4a78b2abee5228866e01dd804f8 SHA256 6409b1adbddbdb96d682ddb973e54f37d5e253b5b226e74b50b8d0874b553638
 AUX gettext-0.17-x-python.patch 1054 RMD160 5de4646fe872d6cea8ec843fa6e2c519cde20cc7 SHA1 7b374fbd566a78265d1d930bf29d1da9782e9dc3 SHA256 d0b959a7d094f2d51fcd5a2472db5b657d5feeb7e0fdec1f33db728e2d82d38b
+AUX gettext-0.18.1.1-uclibc-sched_param-def.patch 648 RMD160 2083b28d495f377e2075732df46bef89208e9fe7 SHA1 bed00c6cc3d0f2116f8905dad5b28feb7ff8b506 SHA256 9793f511543a09cfb3454fa2ad1fd3a565c207152d020b35d62ae9460550c47f
 DIST gettext-0.16.1.tar.gz 8539634 RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 SHA1 8642f4346dfd6a18ecd883329e150bfe9e0886c3 SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
 DIST gettext-0.17.tar.gz 11640890 RMD160 36df9d4ad2848ec26729781e0d7e25b419e7d261 SHA1 c51803d9f745f6ace36bd09c0486d5735ce399cf SHA256 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
 DIST gettext-0.18.1.1.tar.gz 15139737 RMD160 0ca0b6bf0219440404a86f0c16cbac3d1a2ecd37 SHA1 5009deb02f67fc3c59c8ce6b82408d1d35d4e38f SHA256 93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9
@@ -15,16 +16,16 @@ DIST gettext-0.18.tar.gz 12011166 RMD160 7725881dd68cc05d0b782fe64c08acc90eb6146
 EBUILD gettext-0.16.1-r1.ebuild 3234 RMD160 90984aaa1a53e10793cbf833cf96216df0bb9ac5 SHA1 8fc7d7ea0bb9a4ea2035d55aaeda45a8b6b2d593 SHA256 1bcf07cb8e3dcd6f825fc439b86ac35200df064c8d726d69cf7cd403f7643d35
 EBUILD gettext-0.17-r1.ebuild 3712 RMD160 69374518b21fcb93d9b6dc3a78024d6f81637e0a SHA1 13459af8f378ac5dda812e96024a8002191669c8 SHA256 9dce6782dbc8922f28ddaed6240a1c2f713e57b757fd970e34ab5d68a4d59720
 EBUILD gettext-0.18.1.1-r1.ebuild 2948 RMD160 7e87c8b9eddf03afdc9d2f882b67f9dcfb73812d SHA1 4f8a82d39ddd1715fc141ae77134ca8135d375da SHA256 cfd162180827ab7dcffd26b04453089a398219382376193b4698d9d75d7fe2b8
-EBUILD gettext-0.18.1.1-r2.ebuild 3378 RMD160 ccc1d8b901f5d6f5acf385e854b16a3534da37a8 SHA1 c552a5d3d8a93cc46197c53436bd4bc257c3fe6e SHA256 67ade4269ba898e2fd1b2ba344d018d1b7ace225c6a77ce890188cc5a3bbd661
+EBUILD gettext-0.18.1.1-r2.ebuild 3443 RMD160 6c6bf700f8d85c16608a1c511b3aa9f17f60cfe1 SHA1 fdd637eec9ab3e0f6a26213ead11d73b090865df SHA256 27b20deaa7c09e24aebcfe10c974bf2d7e32e84b74f703a36a9904063c830153
 EBUILD gettext-0.18.1.1.ebuild 2852 RMD160 90629c3163fd1a2e88e6ecf7442879b671dc20dc SHA1 ca161605bde8a94c821e064f61168e404ceebf15 SHA256 dd0f8683710651d0c64e71ecbb178599d5e47cd067c3655c4abb0d4937abf9e1
 EBUILD gettext-0.18.1.ebuild 2850 RMD160 e909118324dfda069cd37960194a1b8ae094b5ad SHA1 5e51cb758bf5771a382b593ea0cf03b3bd251b47 SHA256 834fc6c9f7a848f74b9603407f07e8bcbc9ef2d9cb38418aaf39b85bf453f526
 EBUILD gettext-0.18.ebuild 2702 RMD160 1c6bd9088c15ed7a54c0b032a1529e1471a9fb55 SHA1 c8a99981f4a2a8ef45539467654646670981d100 SHA256 b010debd27935050014349a61738c91bdcbcd95f012dd61c484dd9174ff103b9
-MISC ChangeLog 24912 RMD160 746aa71b95b4e434e7a56e4ded4ef6102e87cb53 SHA1 93949877ac34b4b7fb846b572417674889d72414 SHA256 bdbc2adf26106da4ca2dbf91d90470daa2b52388f30acb4120e6c3b84062e9fa
+MISC ChangeLog 25199 RMD160 6c3b95f073d3ad07b7d6680abf446c4326d93580 SHA1 2ef6a318277005f24fe7bb084fe9d7a0c6fcbba6 SHA256 bd6f3c200bc30ab98342f4c33ca942f6762cc4bf16ec6a50b8b6c75ff096e43c
 MISC metadata.xml 370 RMD160 d4affadca5919e8b349259ec245da6bb9164d735 SHA1 52bde5b27f373b5ce42d98346e8c8366cc7c22ee SHA256 75e6b478fb79e4575d24b15c4a5963c4f7a00fda1816d3993527887b3cdfde66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2fZJ0ACgkQcxLzpIGCsLTF7QCdHaU8Ah72dYPD0+wBW6Qo91VM
-cM8An3K7552y/HfCvoF441zgzq2WwaGW
-=lZ3o
+iF4EAREIAAYFAk5m1vMACgkQaC/OocHi7Ja6zAD+Ng5AXuvZcpV3tb8B5HaE799H
+oYOJaW6fAEsoe3h7mAoA/1ERhhJtVNZ5U9v+LZXWuNVEjnJXWtdDsBggesLZ0U8U
+=EEw7
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..4e39278
--- /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 60a8314c077341e20a3baec4945058548222ef0d..37690a5d9ad7500a0d7b15ea060a5e016dd3a2ef 100644 (file)
--- 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() {