diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-11-15 20:43:45 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-11-15 20:43:45 +0000 |
| commit | f1d09c21e45d178ae94b7eae9679ab87aad7a3c6 (patch) | |
| tree | 61136cc5e6858e4ca391df3a74d5df3228e80593 /net-analyzer/argus | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f1d09c21e45d178ae94b7eae9679ab87aad7a3c6.tar.gz gentoo-2-f1d09c21e45d178ae94b7eae9679ab87aad7a3c6.tar.bz2 gentoo-2-f1d09c21e45d178ae94b7eae9679ab87aad7a3c6.zip | |
Do not continue when a sub-make errors (bug #380953).
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/argus')
| -rw-r--r-- | net-analyzer/argus/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/argus/argus-3.0.5.6.ebuild | 5 | ||||
| -rw-r--r-- | net-analyzer/argus/files/argus-3.0.5-Makefile.patch | 13 |
3 files changed, 21 insertions, 3 deletions
diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog index 8e54d39f7829..8af18649e0dd 100644 --- a/net-analyzer/argus/ChangeLog +++ b/net-analyzer/argus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/argus # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.35 2011/11/15 20:25:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.36 2011/11/15 20:43:45 jer Exp $ + + 15 Nov 2011; Jeroen Roovers <jer@gentoo.org> argus-3.0.5.6.ebuild, + +files/argus-3.0.5-Makefile.patch: + Do not continue when a sub-make errors (bug #380953). *argus-3.0.5.6 (15 Nov 2011) diff --git a/net-analyzer/argus/argus-3.0.5.6.ebuild b/net-analyzer/argus/argus-3.0.5.6.ebuild index baf306b85e54..77fbc2f2b685 100644 --- a/net-analyzer/argus/argus-3.0.5.6.ebuild +++ b/net-analyzer/argus/argus-3.0.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.5.6.ebuild,v 1.1 2011/11/15 20:25:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.5.6.ebuild,v 1.2 2011/11/15 20:43:45 jer Exp $ EAPI="4" @@ -36,7 +36,8 @@ src_prepare() { -i support/Config/argus.conf || die # sed -e 's:.*="-O.*":true:g' -i acsite.m4 || die epatch \ - "${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \ + "${FILESDIR}"/${PN}-3.0.5-Makefile.patch eautoreconf } diff --git a/net-analyzer/argus/files/argus-3.0.5-Makefile.patch b/net-analyzer/argus/files/argus-3.0.5-Makefile.patch new file mode 100644 index 000000000000..e4c3e1981c2f --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.5-Makefile.patch @@ -0,0 +1,13 @@ +Do not continue when a sub-make errors (bug #380953). + +--- a/Makefile.in ++++ b/Makefile.in +@@ -55,7 +55,7 @@ + .PHONY: install installdirs all + + all: force +- @-for d in $(DIRS);\ ++ @for d in $(DIRS);\ + do \ + (cd $$d; echo "### Making in" `pwd`;\ + $(MAKE) $(MFLAGS) ;\ |