[oe-commits] Roy Li : collectd: fix a floating dependence on openjdk

git at git.openembedded.org git at git.openembedded.org
Fri Sep 18 11:06:11 UTC 2015


Module: meta-openembedded.git
Branch: master-next
Commit: 65838a76332f15296631bc8df3fd9e246a635c39
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=65838a76332f15296631bc8df3fd9e246a635c39

Author: Roy Li <rongqing.li at windriver.com>
Date:   Fri Sep 11 17:24:43 2015 +0800

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 at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-extended/collectd/collectd_5.5.0.bb | 1 +
 1 file changed, 1 insertion(+)

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 55d7b38..6a3476f 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"
 FPLAYOUT ?= "--with-fp-layout=nothing"
 
 PACKAGECONFIG ??= ""
+PACKAGECONFIG[openjdk] = "--with-java=${STAGING_DIR_TARGET}${libdir}/jvm,--without-java,openjdk-7"
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
 PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
 PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"



More information about the Openembedded-commits mailing list