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 | 8cb9cfdebd9f2851955befd4ed73a2823cdb3744 (patch) | |
| tree | ddde2a1c93d9c7a4f08ac01db50eecd286699991 /sys-process/psmisc | |
| parent | Marking valknut-0.4.9 ppc64 for bug 297186 (diff) | |
| download | gentoo-2-8cb9cfdebd9f2851955befd4ed73a2823cdb3744.tar.gz gentoo-2-8cb9cfdebd9f2851955befd4ed73a2823cdb3744.tar.bz2 gentoo-2-8cb9cfdebd9f2851955befd4ed73a2823cdb3744.zip | |
Fix building with -O0 where glibc doesn't include locale.h by itself wrt #299316.
(Portage version: 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/files/psmisc-22.9-locale.patch | 16 | ||||
| -rw-r--r-- | sys-process/psmisc/psmisc-22.9.ebuild | 3 |
3 files changed, 24 insertions, 2 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/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 |