summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2004-09-15 08:26:39 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2004-09-15 08:26:39 +0000
commit27a6663e55090aca2fe68586feba080ee0e23515 (patch)
tree0eb17f7b0361f66c5f148161d760fd2befde81e2 /sys-apps/procps
parentNew version (Manifest recommit) (diff)
downloadgentoo-2-27a6663e55090aca2fe68586feba080ee0e23515.tar.gz
gentoo-2-27a6663e55090aca2fe68586feba080ee0e23515.tar.bz2
gentoo-2-27a6663e55090aca2fe68586feba080ee0e23515.zip
Make this compile with GCC3.4.
Diffstat (limited to 'sys-apps/procps')
-rw-r--r--sys-apps/procps/ChangeLog5
-rw-r--r--sys-apps/procps/procps-3.2.3-r1.ebuild11
2 files changed, 13 insertions, 3 deletions
diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index e438cf23a23e..7d0ab52ff181 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/procps
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.83 2004/09/14 13:41:20 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.84 2004/09/15 08:26:39 robbat2 Exp $
+
+ 15 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> procps-3.2.3-r1.ebuild:
+ Make this compile with GCC3.4.
14 Sep 2004; Brandon Low <lostlogic@gentoo.org>
-files/procps-3.1.11-multipids.patch, -files/procps-3.1.12-selinux.diff.bz2,
diff --git a/sys-apps/procps/procps-3.2.3-r1.ebuild b/sys-apps/procps/procps-3.2.3-r1.ebuild
index 657b3d60863c..35e8ba7daaf7 100644
--- a/sys-apps/procps/procps-3.2.3-r1.ebuild
+++ b/sys-apps/procps/procps-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.3-r1.ebuild,v 1.1 2004/09/14 13:38:11 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.3-r1.ebuild,v 1.2 2004/09/15 08:26:39 robbat2 Exp $
inherit flag-o-matic eutils
@@ -19,12 +19,19 @@ src_unpack() {
unpack ${A}
cd ${S}
- sed -i -e "/install/s: --strip : :" Makefile
+ # Clean up the makefile
+ # firstly we want to control stripping
+ # and secondly these gcc flags have changed
+ sed -i Makefile \
+ -e '/install/s: --strip : :' \
+ -e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
+ -e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,'
# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
# userspace anymore, so this patch instructs procps to get the
# value from sysconf().
use mips && epatch ${FILESDIR}/${PN}-mips-define-pagesize.patch
+
}
src_compile() {