diff options
| author | Andrew McDermott <andrew.mcdermott@linaro.org> | 2013-10-07 15:43:45 +0100 |
|---|---|---|
| committer | Andrew McDermott <andrew.mcdermott@linaro.org> | 2013-10-08 20:59:24 +0100 |
| commit | 95735ccaa20d3e343d7bf24528a150571bb8ed80 (patch) | |
| tree | 1015b3926d72377a4e2e0498509eaf39467d1f14 /meta-aarch64 | |
| parent | 4fc4807a90bf0bfec35fb54bbe1a8f6133be6d6b (diff) | |
leg-java: openjdk-8: remove icedtea7-native build dependency
This commit breaks the build dependency on the icedtea7-native package
and will instead rely on the installed version of java/javac from the
build host when bootstrapping.
Change-Id: I76fd18fb101af87fccae36ec1fdbfa818a434701
Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
Diffstat (limited to 'meta-aarch64')
| -rw-r--r-- | meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc index 70efb76c..a83b242a 100644 --- a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc +++ b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc @@ -1,12 +1,12 @@ DESCRIPTION = "Java runtime based upon the OpenJDK8" -HOMEPAGE = "http://icedtea.classpath.org" +HOMEPAGE = "http://openjdk.java.net/projects/jdk8" LICENSE = "GPL-2.0-with-classpath-exception" PRIORITY = "optional" SECTION = "libs" INHIBIT_PACKAGE_STRIP = "1" #INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INC_PR = "r12" +INC_PR = "r13" SRC_URI = " \ ${OPENJDK_URI} \ @@ -22,7 +22,6 @@ PN = "${JDKPN}-jre" PROVIDES += "${JDKPN}" DEPENDS = " \ - icedtea7-native \ zip-native \ zlib \ jpeg libpng giflib \ @@ -53,7 +52,7 @@ S="${WORKDIR}/openjdk8-aarch64-port-snapshot" do_configure() { unset MAKE - bash ./configure --with-debug-level=release --with-jvm-variants=client --with-sys-root=${STAGING_DIR_TARGET} --enable-unlimited-crypto --openjdk-target=aarch64-oe-linux --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native/jre/lib/security/cacerts --with-zlib=system --with-stdc++lib=dynamic --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/icedtea7-native --disable-ccache + bash ./configure --with-debug-level=release --with-jvm-variants=client --with-sys-root=${STAGING_DIR_TARGET} --openjdk-target=aarch64-oe-linux --with-zlib=system --with-stdc++lib=dynamic --disable-ccache } do_compile() { @@ -104,9 +103,8 @@ FILES_${PN} = " \ INSANE_SKIP_${JDKPN}-jdk = "dev-so" INSANE_SKIP_${JDKPN}-jre = "dev-so" -RPROVIDES_${JDKPN}-jre = "java2-runtime" -RPROVIDES_${JDKPN}-jre = "java2-vm" - +RPROVIDES_${JDKPN}-jre = "java2-runtime java2-vm" +RPROVIDES_${JDKPN}-jdk = "java2-runtime java2-vm" RDEPENDS_${JDKPN}-demo = "java2-runtime" inherit update-alternatives |