diff options
author | Amy Fong <amy.fong@windriver.com> | 2015-04-16 13:56:46 -0400 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-01-04 09:21:06 -0200 |
commit | 6f3a8e88a491a4f47a00c841d1b492f3402999ae (patch) | |
tree | 9564940f3578da49187643b9c156c0b88e802b54 | |
parent | ada652564f09756a81f54495cbc2091125239625 (diff) | |
download | meta-java-6f3a8e88a491a4f47a00c841d1b492f3402999ae.tar.gz |
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 <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-rw-r--r-- | recipes-core/classpath/classpath-native_0.99.bb | 2 | ||||
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 2 | ||||
-rw-r--r-- | recipes-core/jamvm/jamvm.inc | 2 |
3 files changed, 3 insertions, 3 deletions
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 @@ | |||
1 | require classpath-native.inc | 1 | require classpath-native.inc |
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" |
4 | DEPENDS += "ecj-initial-native" | 4 | DEPENDS += "ecj-initial-native virtual/java-initial-native" |
5 | 5 | ||
6 | PR = "${INC_PR}.0" | 6 | PR = "${INC_PR}.0" |
7 | 7 | ||
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 | |||
17 | OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" | 17 | OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" |
18 | CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" | 18 | CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" |
19 | 19 | ||
20 | inherit native java autotools | 20 | inherit native java autotools pkgconfig |
21 | 21 | ||
22 | JAVA_HOME[unexport] = "1" | 22 | JAVA_HOME[unexport] = "1" |
23 | 23 | ||
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/" | |||
3 | LICENSE = "GPL-2.0" | 3 | LICENSE = "GPL-2.0" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
5 | 5 | ||
6 | DEPENDS = "zlib classpath virtual/javac-native libffi" | 6 | DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" |
7 | DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native" | 7 | DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native" |
8 | 8 | ||
9 | RDEPENDS_${PN} = "classpath" | 9 | RDEPENDS_${PN} = "classpath" |