summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-06-27 21:10:46 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-06-27 21:10:46 +0000
commitbd13a8f872573bad3828f45b813553020feeb506 (patch)
treef491533bfca87a3bc09f27f4ecfa581f9ec72551 /net-analyzer/nagios-core
parentVersion bump. (diff)
downloadgentoo-2-bd13a8f872573bad3828f45b813553020feeb506.tar.gz
gentoo-2-bd13a8f872573bad3828f45b813553020feeb506.tar.bz2
gentoo-2-bd13a8f872573bad3828f45b813553020feeb506.zip
QA: call econf in src_configure(), #275633
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'net-analyzer/nagios-core')
-rw-r--r--net-analyzer/nagios-core/ChangeLog6
-rw-r--r--net-analyzer/nagios-core/nagios-core-3.1.2.ebuild11
2 files changed, 10 insertions, 7 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index bbd448470fc5..0e3462680d87 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-core
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.152 2009/06/27 13:07:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.153 2009/06/27 21:10:46 dertobi123 Exp $
+
+ 27 Jun 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+ nagios-core-3.1.2.ebuild:
+ QA: call econf in src_configure(), #275633
27 Jun 2009; Brent Baude <ranger@gentoo.org> nagios-core-2.12-r1.ebuild,
nagios-core-3.0.6-r2.ebuild:
diff --git a/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild b/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild
index 894bd9001b23..c161f4f9be7d 100644
--- a/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild,v 1.1 2009/06/24 21:27:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.2.ebuild,v 1.2 2009/06/27 21:10:46 dertobi123 Exp $
EAPI="2"
@@ -36,15 +36,12 @@ pkg_setup() {
enewuser nagios -1 /bin/bash /var/nagios/home nagios
}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
local strip="$(echo '$(MAKE) strip-post-install')"
sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
}
-src_compile() {
+src_configure() {
local myconf
if use perl ; then
@@ -80,7 +77,9 @@ src_compile() {
--sysconfdir=/etc/nagios \
--libexecdir=/usr/$(get_libdir)/nagios/plugins \
|| die "./configure failed"
+}
+src_compile() {
emake CC=$(tc-getCC) nagios || die "make failed"
if use web ; then