diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-02 14:24:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-02 14:24:56 +0000 |
| commit | e47b16943a26fbdbaadd95f4cf9d98fe80bac4fa (patch) | |
| tree | cca978ac57d6b8a710d6bbcd89020a22aedbaf99 /sys-process/psmisc | |
| parent | Marking valknut-0.4.9 ppc64 for bug 297186 (diff) | |
| download | historical-e47b16943a26fbdbaadd95f4cf9d98fe80bac4fa.tar.gz historical-e47b16943a26fbdbaadd95f4cf9d98fe80bac4fa.tar.bz2 historical-e47b16943a26fbdbaadd95f4cf9d98fe80bac4fa.zip | |
Fix building with -O0 where glibc doesn't include locale.h by itself wrt #299316.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'sys-process/psmisc')
| -rw-r--r-- | sys-process/psmisc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-process/psmisc/Manifest | 5 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.9-locale.patch | 16 | ||||
| -rw-r--r-- | sys-process/psmisc/psmisc-22.9.ebuild | 3 |
4 files changed, 27 insertions, 4 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog index 280a136e0a8d..929227f3b8c4 100644 --- a/sys-process/psmisc/ChangeLog +++ b/sys-process/psmisc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-process/psmisc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.93 2010/01/02 10:35:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.94 2010/01/02 14:24:56 ssuominen Exp $ + + 02 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> psmisc-22.9.ebuild, + +files/psmisc-22.9-locale.patch: + Fix building with -O0 where glibc doesn't include locale.h by itself wrt + #299316. *psmisc-22.9 (02 Jan 2010) diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest index f3e3d9aa2e89..a4e6bc031a42 100644 --- a/sys-process/psmisc/Manifest +++ b/sys-process/psmisc/Manifest @@ -1,7 +1,8 @@ AUX psmisc-22.5-no-nls.patch 736 RMD160 ac2c51cccc6c95f0aa47efe1ecaeb0d5eaefbce9 SHA1 0227573aa987bfb78ecef891673dc2792c98aba5 SHA256 b2137d22d62276cbd4a1b154c119df025d864054063302a91b5a1610f6c7102c +AUX psmisc-22.9-locale.patch 381 RMD160 fa5813ca33c97f78a8b42339d4b4ea6fcfe3b228 SHA1 e463f918b98ed65eebd468d7b27c629bddeb43a8 SHA256 86046f507f81fbea6b523a8723c6a829def8e817e963b1e81def27f5c4fbf42f DIST psmisc-22.7.tar.gz 309178 RMD160 97341ce1953d2c226f01d92e952e7a001456be15 SHA1 8226ecc284c8cd1e151523df56a1ba9f9c0fa3f5 SHA256 049c874c3353798afe9223dde8450376bd8a5cc336f863fb9294238735d11dad DIST psmisc-22.9.tar.gz 316530 RMD160 bd97857fc774898f1306da696a10d632d3bb75b6 SHA1 aed1bd0631239c4f8e28764ad55d4b4ad02671f0 SHA256 c98aef4bc379790229c54c8e7d97b1d1ab898346bfffcde54fcf585a3e353edd EBUILD psmisc-22.7.ebuild 1567 RMD160 8fd6f390835d2ad65154e3ca633ebe1fd0a714af SHA1 16495bfb83c788327f5239b2249df11a77ad0cf9 SHA256 d160ee5e7c15658b1a476c2cdb75216ef6c05288e46071d9a5e74cee0cc1b9d3 -EBUILD psmisc-22.9.ebuild 1571 RMD160 f36e10e3b43cfcd11d62e2b3adcac5c8bee6ba5b SHA1 e9d837993bbdb87a6239129b4277769bc44e0f24 SHA256 dd7c17578807fe953cd8f9b7511d26936c6d4076a1946672f99a6075dfd8d2ab -MISC ChangeLog 16869 RMD160 25c065fa609d3ce0bd6fec7b0514150a0d2b6f08 SHA1 727609206a0d002affbef003e5343257b72d235f SHA256 eb868c10e7cd6b48023c39e7a4ad51cc70a9a7646a880f3cff06817f5e255332 +EBUILD psmisc-22.9.ebuild 1611 RMD160 142d77a6b626fa119e1b6164fbb224c6ef189489 SHA1 d95914214ecb712e31faea4604ca8a1688475ee6 SHA256 46140a72979c2f79a0720caa56b35a9da69adf94d6fc01378b062d5740cfe902 +MISC ChangeLog 17065 RMD160 4991f5e5211e063780892d9ba54e1ff156c8c638 SHA1 1eaa8b4932955a996e7964925eb181927d99069a SHA256 7daae8aa511cfbae046a8ec05d0e334e0dbb2e31c82bc040c9be85cbe45af443 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-process/psmisc/files/psmisc-22.9-locale.patch b/sys-process/psmisc/files/psmisc-22.9-locale.patch new file mode 100644 index 000000000000..1346d099b1c7 --- /dev/null +++ b/sys-process/psmisc/files/psmisc-22.9-locale.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/show_bug.cgi?id=299316 +http://sourceforge.net/tracker/?func=detail&aid=2922163&group_id=15273&atid=115273 + +--- psmisc-22.9/src/killall.c ++++ psmisc-22.9/src/killall.c +@@ -44,6 +44,10 @@ + #include <ctype.h> + #include <assert.h> + ++#ifdef HAVE_LOCALE_H ++#include <locale.h> ++#endif ++ + #ifdef WITH_SELINUX + #include <selinux/selinux.h> + #endif /*WITH_SELINUX*/ diff --git a/sys-process/psmisc/psmisc-22.9.ebuild b/sys-process/psmisc/psmisc-22.9.ebuild index 10011abe3a37..8b00fb79ff21 100644 --- a/sys-process/psmisc/psmisc-22.9.ebuild +++ b/sys-process/psmisc/psmisc-22.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.9.ebuild,v 1.1 2010/01/02 10:35:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.9.ebuild,v 1.2 2010/01/02 14:24:56 ssuominen Exp $ inherit eutils autotools @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-locale.patch use nls || epatch "${FILESDIR}"/${PN}-22.5-no-nls.patch #193920 sed -i -e '/ACLOCAL_AMFLAGS/d' Makefile.am || die eautoreconf |