summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-09-11 17:24:43 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-09-23 15:37:18 +0200
commit61b3dfda7bd204b614960bcfe67c2025699cfb97 (patch)
tree0a3b31a40048b1d89f0a6b06d33ff6fe0544cabf
parentda6021b2251a2d796ec6a19946ce4273429cba09 (diff)
downloadmeta-openembedded-61b3dfda7bd204b614960bcfe67c2025699cfb97.tar.gz
collectd: fix a floating dependence on openjdk
1. fix a floating dependence on openjdk 2. fix the host contamination, since the default value of java home is /usr/lib/jvm: warning: library search path "/usr/lib/jvm/jre-1.7.0/lib/amd64/server" is unsafe for cross-compilation Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-extended/collectd/collectd_5.5.0.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
index 55d7b3884..6a3476f54 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb
@@ -25,6 +25,7 @@ SYSTEMD_SERVICE_${PN} = "collectd.service"
25FPLAYOUT ?= "--with-fp-layout=nothing" 25FPLAYOUT ?= "--with-fp-layout=nothing"
26 26
27PACKAGECONFIG ??= "" 27PACKAGECONFIG ??= ""
28PACKAGECONFIG[openjdk] = "--with-java=${STAGING_DIR_TARGET}${libdir}/jvm,--without-java,openjdk-7"
28PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp" 29PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
29PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached" 30PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
30PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables" 31PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"