summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-05-11 18:08:24 +0000
committerMike Frysinger <vapier@gentoo.org>2009-05-11 18:08:24 +0000
commit8fc25ba89bbedf9fa22363a3c7753029b651e3f8 (patch)
treedddb23ecd2ce51cf3986eed8149555acdd0705bd /sys-process/lsof
parentAdded Jason Wallace to maintainers. (diff)
downloadgentoo-2-8fc25ba89bbedf9fa22363a3c7753029b651e3f8.tar.gz
gentoo-2-8fc25ba89bbedf9fa22363a3c7753029b651e3f8.tar.bz2
gentoo-2-8fc25ba89bbedf9fa22363a3c7753029b651e3f8.zip
Improve how we past build flags/settings to avoid custom patches.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-process/lsof')
-rw-r--r--sys-process/lsof/ChangeLog5
-rw-r--r--sys-process/lsof/lsof-4.82.ebuild26
2 files changed, 18 insertions, 13 deletions
diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 9a787e3ec35d..1fa79468e115 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-process/lsof
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.62 2009/05/11 06:09:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.63 2009/05/11 18:08:24 vapier Exp $
+
+ 11 May 2009; Mike Frysinger <vapier@gentoo.org> lsof-4.82.ebuild:
+ Improve how we past build flags/settings to avoid custom patches.
*lsof-4.82 (11 May 2009)
diff --git a/sys-process/lsof/lsof-4.82.ebuild b/sys-process/lsof/lsof-4.82.ebuild
index 1eefb8e29888..f7db603bb682 100644
--- a/sys-process/lsof/lsof-4.82.ebuild
+++ b/sys-process/lsof/lsof-4.82.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v 1.1 2009/05/11 06:09:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v 1.2 2009/05/11 18:08:24 vapier Exp $
-inherit eutils flag-o-matic fixheadtails toolchain-funcs
+inherit flag-o-matic toolchain-funcs
MY_P=${P/-/_}
DESCRIPTION="Lists open files for running Unix processes"
@@ -26,24 +26,26 @@ src_unpack() {
unpack ./${MY_P}_src.tar
cd "${S}"
- # now patch the scripts to automate everything
- ht_fix_file Configure Customize
- touch .neverInv
- epatch "${FILESDIR}"/${PN}-4.78-answer-config.patch
sed -i \
+ -e '/LSOF_CFGF="-/s:=":="$LSOF_CFGF :' \
+ -e '/^LSOF_CFGF=/s:$:" ${CFLAGS} ${CPPFLAGS}":' \
+ -e "/^LSOF_CFGL=/s:\$:' \$(LDFLAGS)':" \
-e "/^LSOF_RANLIB/s:ranlib:$(tc-getRANLIB):" \
Configure
}
+yesno() { use $1 && echo y || echo n ; }
+target() { use kernel_FreeBSD && echo freebsd || echo linux ; }
+
src_compile() {
use static && append-ldflags -static
- use selinux && export LINUX_HASSELINUX=Y
- export LSOF_CC=$(tc-getCC)
- export LSOF_AR="$(tc-getAR) rc"
- local target="linux"
- use kernel_FreeBSD && target=freebsd
- ./Configure ${target} || die "configure failed"
+ touch .neverInv
+ LINUX_HASSELINUX=$(yesno selinux) \
+ LSOF_CC=$(tc-getCC) \
+ LSOF_AR="$(tc-getAR) rc" \
+ ./Configure -n $(target) || die
+
emake DEBUG="" all || die "emake failed"
}