From cfbee01c9a51eb6c8f73837fc4e22d52c7cf65e8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Wed, 7 Oct 2015 12:47:47 +0200 Subject: [PATCH] nmap: unbreak cross compilation --- srcpkgs/nmap/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index 21115ab5176..1b0578d5024 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -1,35 +1,34 @@ # Template file for 'nmap' pkgname=nmap version=6.47 -revision=8 +revision=9 build_style=gnu-configure -configure_args="--without-ndiff --with-openssl $(vopt_with lua liblua=${XBPS_CROSS_BASE}/usr/lib/lua5.2)" +configure_args="--without-ndiff --with-openssl $(vopt_with lua liblua)" makedepends="libpcap-devel pcre-devel libressl-devel $(vopt_if lua lua52-devel)" short_desc="Utility for network discovery and security auditing" maintainer="Juan RP " license="GPL-2" homepage="http://nmap.org" -distfiles="http://nmap.org/dist/nmap-$version.tar.bz2" +distfiles="http://nmap.org/dist/nmap-${version}.tar.bz2" checksum=8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 # Package build options build_options="lua" build_options_default="lua" +CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" if [ -z "$CROSS_BUILD" ]; then subpackages="nmapfe" makedepends+=" pygtk-devel" configure_args+=" --with-zenmap" else - # Currently broken for cross - broken="http://build.voidlinux.eu/builders/armv7l_builder/builds/18047/steps/shell_3/logs/stdio" unset subpackages configure_args+=" --without-zenmap" fi nmapfe_package() { noarch=yes - depends="nmap>=$version desktop-file-utils pygtk" + depends="nmap-${version}_${revision} desktop-file-utils pygtk" pycompile_module="radialnet zenmapCore zenmapGUI" short_desc+=" - GTK Frontend" pkg_install() {