summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2014-08-20 21:20:32 -0700
committerArmin Kuster <akuster808@gmail.com>2014-09-13 10:25:08 -0700
commit332b02ec89ddbabd945323fc860670e8e7317ce0 (patch)
tree26fdffe72f0f7228af0cb1c0ba61ec92f3a7e054
parent1f28cd51dcd762ebbb22510aed868f1661541252 (diff)
downloadmeta-security-332b02ec89ddbabd945323fc860670e8e7317ce0.tar.gz
nmap: New QA issue via ppc
Fixes: WARNING: QA Issue: nmap rdepends on libpcap, but it isn't a build dependency? [build-deps] nmap internal lua library does not compile with PPC so use OE version instead. Changed PACKAGECONFIG assignment from "??=" to "=". It was empty when using PPC. Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/nmap/nmap_6.46.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-security/nmap/nmap_6.46.bb b/recipes-security/nmap/nmap_6.46.bb
index 573187d..a04dc7b 100644
--- a/recipes-security/nmap/nmap_6.46.bb
+++ b/recipes-security/nmap/nmap_6.46.bb
@@ -11,10 +11,10 @@ SRC_URI[sha256sum] = "3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4
11 11
12inherit autotools-brokensep pkgconfig distro_features_check 12inherit autotools-brokensep pkgconfig distro_features_check
13 13
14PACKAGECONFIG ??= "ncat nping ndiff pcap" 14PACKAGECONFIG = "ncat nping ndiff pcap lua"
15PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "zenmap", "", d)}" 15PACKAGECONFIG += " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "zenmap", "", d)}"
16 16
17PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap" 17PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
18PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" 18PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl"
19 19
20#disable/enable packages 20#disable/enable packages
@@ -23,7 +23,7 @@ PACKAGECONFIG[ncat] = ",--without-ncat,"
23PACKAGECONFIG[ndiff] = ",--without-ndiff," 23PACKAGECONFIG[ndiff] = ",--without-ndiff,"
24 24
25#use nmap's Included or system's libs 25#use nmap's Included or system's libs
26PACKAGECONFIG[lua] = "--with-liblua=${STAGING_LIBDIR}/.., --with-liblua=included, lua" 26PACKAGECONFIG[lua] = "--with-liblua=${STAGING_LIBDIR}/.., --without-liblua, lua"
27PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" 27PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre"
28 28
29#Add gui 29#Add gui