diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-01-16 09:18:19 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-01-16 09:18:19 +0000 |
| commit | 1631f35b0878ba209920efe1af42e175fe8f69f9 (patch) | |
| tree | ff26a249933277105f7297c60ee614b6a55f051e /net-analyzer/nmap | |
| parent | Filter -Wl,* from LDFLAGS to prevent build failures on ARM (diff) | |
| download | gentoo-2-1631f35b0878ba209920efe1af42e175fe8f69f9.tar.gz gentoo-2-1631f35b0878ba209920efe1af42e175fe8f69f9.tar.bz2 gentoo-2-1631f35b0878ba209920efe1af42e175fe8f69f9.zip | |
Fix building with USE='lua' due to recent changes, wrt bug #452452. Thanks to Marien Zwart
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-analyzer/nmap')
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.01.ebuild | 4 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.25.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 50ff76978cd0..76934aa2ae43 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,11 @@ # 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.278 2013/01/16 07:55:37 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.279 2013/01/16 09:18:19 pinkbyte Exp $ + + 16 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> nmap-6.01.ebuild, + nmap-6.25.ebuild: + Fix building with USE='lua' due to recent changes, wrt bug #452452. Thanks to + Marien Zwart 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 e05b13341158..2cbb47583022 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.18 2013/01/16 07:55:37 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.19 2013/01/16 09:18:19 pinkbyte Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -76,7 +76,7 @@ src_prepare() { # 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/d' liblua/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 } diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild index 0f7af9b156df..22ec31ca75cc 100644 --- a/net-analyzer/nmap/nmap-6.25.ebuild +++ b/net-analyzer/nmap/nmap-6.25.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.25.ebuild,v 1.7 2013/01/16 07:55:37 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.8 2013/01/16 09:18:19 pinkbyte Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -107,7 +107,7 @@ src_prepare() { # 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/d' liblua/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 } |