summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-12-02 01:41:55 +0000
committerAlec Warner <antarus@gentoo.org>2006-12-02 01:41:55 +0000
commitef66947dd6cd53ba7e88aaceb290226bb91a304f (patch)
treede6a4f5c1456b7634eced38213d301ca5d88c4b1 /app-admin
parentbump for 142293, fix webmin-pam (diff)
downloadgentoo-2-ef66947dd6cd53ba7e88aaceb290226bb91a304f.tar.gz
gentoo-2-ef66947dd6cd53ba7e88aaceb290226bb91a304f.tar.bz2
gentoo-2-ef66947dd6cd53ba7e88aaceb290226bb91a304f.zip
fix pre-stripped binaries for QA, thanks to jakub Moc for the patch
(Portage version: 2.1.2_pre3-r9)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/procinfo/ChangeLog8
-rw-r--r--app-admin/procinfo/files/digest-procinfo-18-r12
-rw-r--r--app-admin/procinfo/files/procinfo-flags.patch16
-rw-r--r--app-admin/procinfo/procinfo-18-r1.ebuild13
4 files changed, 31 insertions, 8 deletions
diff --git a/app-admin/procinfo/ChangeLog b/app-admin/procinfo/ChangeLog
index c3e09c66f09d..b1244ff102b3 100644
--- a/app-admin/procinfo/ChangeLog
+++ b/app-admin/procinfo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/procinfo
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/ChangeLog,v 1.18 2006/02/08 21:42:23 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/ChangeLog,v 1.19 2006/12/02 01:41:55 antarus Exp $
+
+ 02 Dec 2006; Alec Warner <antarus@gentoo.org> +files/procinfo-flags.patch,
+ procinfo-18-r1.ebuild:
+ fix pre-stripped binaries for QA, thanks to jakub Moc for the patch
25 Nov 2005; Tom Gall <tgall@gentoo.org> procinfo-18-r1.ebuild:
stable on ppc64
diff --git a/app-admin/procinfo/files/digest-procinfo-18-r1 b/app-admin/procinfo/files/digest-procinfo-18-r1
index 355fe0072975..db6882b5a1f5 100644
--- a/app-admin/procinfo/files/digest-procinfo-18-r1
+++ b/app-admin/procinfo/files/digest-procinfo-18-r1
@@ -1 +1,3 @@
MD5 27658d0a69040aca05a65b9888599d50 procinfo-18.tar.gz 24365
+RMD160 be29226d308aa5c437498d56bf5613f7ed7f0290 procinfo-18.tar.gz 24365
+SHA256 c114e625b87fb06585484eb9f3ff868de165b3e61926fee55479d1bd3de09b99 procinfo-18.tar.gz 24365
diff --git a/app-admin/procinfo/files/procinfo-flags.patch b/app-admin/procinfo/files/procinfo-flags.patch
new file mode 100644
index 000000000000..e254c254e1a9
--- /dev/null
+++ b/app-admin/procinfo/files/procinfo-flags.patch
@@ -0,0 +1,16 @@
+--- procinfo-18/Makefile.orig 2001-02-25 00:29:53.000000000 +0100
++++ procinfo-18/Makefile 2006-10-21 13:57:47.000000000 +0200
+@@ -2,10 +2,10 @@
+
+ prefix=/usr
+
+-CC = gcc -Wall -Wstrict-prototypes
++CC +=
+
+-CFLAGS = -O2
+-LDFLAGS = -s
++CFLAGS += -Wall -Wstrict-prototypes
++LDFLAGS +=
+
+ # If you get lots of `undefined references', you probably need -lncurses
+ # instead:
diff --git a/app-admin/procinfo/procinfo-18-r1.ebuild b/app-admin/procinfo/procinfo-18-r1.ebuild
index f7839bc4dc4e..a41b00eacdaa 100644
--- a/app-admin/procinfo/procinfo-18-r1.ebuild
+++ b/app-admin/procinfo/procinfo-18-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/procinfo-18-r1.ebuild,v 1.7 2005/11/25 16:45:17 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/procinfo-18-r1.ebuild,v 1.8 2006/12/02 01:41:55 antarus Exp $
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="A utility to prettyprint /proc/*"
SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
@@ -17,14 +17,15 @@ RDEPEND="dev-lang/perl"
src_unpack() {
unpack ${A}
- epatch ${FILESDIR}/kernel-2.6.patch
- epatch ${FILESDIR}/cpu-usage-fix.patch
+ epatch "${FILESDIR}"/kernel-2.6.patch
+ epatch "${FILESDIR}"/cpu-usage-fix.patch
+ epatch "${FILESDIR}"/${PN}-flags.patch
}
src_compile() {
# -ltermcap is default and isn't available in gentoo
# but -lncurses works just as good
- emake LDLIBS=-lncurses || die
+ emake CC=$(tc-getCC) LDLIBS=-lncurses || die
}
src_install() {