diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-01-16 19:21:09 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-01-16 19:21:09 +0000 |
| commit | d7a769b479839c6daedef275d6dfa7cf801e417d (patch) | |
| tree | e547a30c552db94bb4236910bca604206536125d /net-analyzer/nmap | |
| parent | remove old; prefer mplayer2 (bug #452440) (diff) | |
| download | gentoo-2-d7a769b479839c6daedef275d6dfa7cf801e417d.tar.gz gentoo-2-d7a769b479839c6daedef275d6dfa7cf801e417d.tar.bz2 gentoo-2-d7a769b479839c6daedef275d6dfa7cf801e417d.zip | |
Fix AR/RANLIB again (bug #445524).
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/nmap')
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.01.ebuild | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 76934aa2ae43..226470721f02 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.279 2013/01/16 09:18:19 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.280 2013/01/16 19:21:09 jer Exp $ + + 16 Jan 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild: + Fix AR/RANLIB again (bug #445524). 16 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> nmap-6.01.ebuild, nmap-6.25.ebuild: diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild index 8440ea9c69e8..d5bb2c7b527c 100644 --- a/net-analyzer/nmap/nmap-6.01.ebuild +++ b/net-analyzer/nmap/nmap-6.01.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.20 2013/01/16 09:21:02 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.21 2013/01/16 19:21:09 jer Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -72,12 +72,6 @@ src_prepare() { -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ zenmap/install_scripts/unix/zenmap-root.desktop \ zenmap/install_scripts/unix/zenmap.desktop || die - - # respect AR and RANLIB, wrt bug #445524 - tc-export AR RANLIB - sed -i -e '/^RANLIB/d' -e '/^AR/d' liblinear/{,blas}/Makefile || die - sed -i -e '/^RANLIB/d' -e "/^AR/s/ar/$(tc-getAR)/" liblua/Makefile || die - sed -i -e '/^AR/d' {libnetutil,libpcre,nbase,nsock/src}/Makefile.in || die } src_configure() { @@ -94,6 +88,12 @@ src_configure() { --with-libdnet=included } +src_compile() { + emake \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) +} + src_install() { LC_ALL=C emake -j1 \ DESTDIR="${D}" \ |