diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-07-13 13:31:10 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-07-13 13:31:10 +0000 |
commit | 1db74fb61ba49d291c5451f108b143c51a58f169 (patch) | |
tree | 15eeb851e5b5986f1ffcaa7302ff495883df05f4 /net-analyzer/masscan | |
parent | Old. (diff) | |
download | gentoo-2-1db74fb61ba49d291c5451f108b143c51a58f169.tar.gz gentoo-2-1db74fb61ba49d291c5451f108b143c51a58f169.tar.bz2 gentoo-2-1db74fb61ba49d291c5451f108b143c51a58f169.zip |
Respect CC even better. mv should die().
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/masscan')
-rw-r--r-- | net-analyzer/masscan/ChangeLog | 5 | ||||
-rw-r--r-- | net-analyzer/masscan/masscan-1.0.3-r1.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net-analyzer/masscan/ChangeLog b/net-analyzer/masscan/ChangeLog index c0dcaa1c0513..13a93e83721d 100644 --- a/net-analyzer/masscan/ChangeLog +++ b/net-analyzer/masscan/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/masscan # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/ChangeLog,v 1.2 2014/03/02 15:30:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/ChangeLog,v 1.3 2014/07/13 13:31:10 jer Exp $ + + 13 Jul 2014; Jeroen Roovers <jer@gentoo.org> masscan-1.0.3-r1.ebuild: + Respect CC even better. mv should die(). *masscan-1.0.3-r1 (02 Mar 2014) diff --git a/net-analyzer/masscan/masscan-1.0.3-r1.ebuild b/net-analyzer/masscan/masscan-1.0.3-r1.ebuild index aa4e7909f2b1..81e7b518e7ee 100644 --- a/net-analyzer/masscan/masscan-1.0.3-r1.ebuild +++ b/net-analyzer/masscan/masscan-1.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild,v 1.1 2014/03/02 15:30:07 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/masscan/masscan-1.0.3-r1.ebuild,v 1.2 2014/07/13 13:31:10 jer Exp $ EAPI=5 inherit toolchain-funcs @@ -19,7 +19,8 @@ DEPEND="${RDEPEND}" src_prepare(){ sed -i \ -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \ - -e "/^GITVER :=/s!= .(.*!=!g" \ + -e '/^GITVER :=/s!= .(.*!=!g' \ + -e '/^SYS/s|gcc|$(CC)|g' \ -e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \ -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \ Makefile || die @@ -30,13 +31,13 @@ src_compile() { } src_install() { - emake install DESTDIR="${D}" PREFIX=/usr + emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install insinto /etc/masscan doins data/exclude.conf doins "${FILESDIR}"/masscan.conf - [ -f doc/bot.hml ] && mv doc/bot.{hml,html} + mv doc/bot.{hml,html} || die dohtml doc/bot.html doman doc/masscan.8 dodoc *.md |