From 6f3a8e88a491a4f47a00c841d1b492f3402999ae Mon Sep 17 00:00:00 2001 From: Amy Fong Date: Thu, 16 Apr 2015 13:56:46 -0400 Subject: Missing inheritance and dependencies in some java packages icedtea7-native, openjdk-7, and jamvm-native requires pkg-config to configure without running into an error similar to 7554: syntax error near unexpected token `NSS,' 7554: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, NSS_FOUND=no)' classpath-native and jamvm-native both needs to depend on java-initial-native Signed-off-by: Amy Fong Signed-off-by: Jackie Huang --- recipes-core/classpath/classpath-native_0.99.bb | 2 +- recipes-core/icedtea/icedtea7-native.inc | 2 +- recipes-core/jamvm/jamvm.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb index 02951b9..d49d7d7 100644 --- a/recipes-core/classpath/classpath-native_0.99.bb +++ b/recipes-core/classpath/classpath-native_0.99.bb @@ -1,7 +1,7 @@ require classpath-native.inc LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" -DEPENDS += "ecj-initial-native" +DEPENDS += "ecj-initial-native virtual/java-initial-native" PR = "${INC_PR}.0" diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 43385e9..b38f3cb 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -17,7 +17,7 @@ PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-nativ OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" -inherit native java autotools +inherit native java autotools pkgconfig JAVA_HOME[unexport] = "1" diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index 777b442..880b1e7 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://jamvm.sourceforge.net/" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -DEPENDS = "zlib classpath virtual/javac-native libffi" +DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native" RDEPENDS_${PN} = "classpath" -- cgit v1.2.3-54-g00ecf