From cf776672172eae7cb1967ac299b673478be67368 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 17 Aug 2012 12:39:30 +0200 Subject: openjdk6: update to icedtea version 1.11.3 * new patch for fixing crosscompile of rmi --- .../openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch | 13 +++++++++++++ recipes-core/openjdk/openjdk-6-common.inc | 4 ++-- recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb | 8 -------- recipes-core/openjdk/openjdk-6_6b24-1.11.3.bb | 10 ++++++++++ 4 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch delete mode 100644 recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb create mode 100644 recipes-core/openjdk/openjdk-6_6b24-1.11.3.bb diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch new file mode 100644 index 0000000..acd3e1e --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch @@ -0,0 +1,13 @@ +diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile +index bdc1f8f..76f0c00 100644 +--- openjdk/jdk/make/com/sun/jmx/Makefile ++++ openjdk/jdk/make/com/sun/jmx/Makefile +@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/ + # when available, we need to run with latest rmic version available. rmic + # launch tool not built at this stage but we can invoke via rmi class. + +-RMIC_JAVA = $(OUTPUTDIR)/bin/java ++RMIC_JAVA = $(BOOTDIR)/bin/java + # need to treat 64bit solaris differently + ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) + RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index a9adbc8..d965736 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc @@ -4,8 +4,8 @@ LICENSE = "GPL-2.0-with-classpath-exception" PRIORITY = "optional" SECTION = "libs" -# Name of the icedtea tarball and top-level directory. -ICEDTEA = "NEEDS TO BE SET" +ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1].split("-")[1] or '1.0'}" +ICEDTEA = "icedtea6-${ICEDTEA_VERSION}" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" diff --git a/recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb b/recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb deleted file mode 100644 index 00027e6..0000000 --- a/recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require openjdk-6-release-6b24.inc - -PR = "${INC_PR}.0" - -ICEDTEA = "icedtea6-1.11.1" - -SRC_URI[iced.md5sum] = "e51d9d2f0328cc5aa7a00943abd96ed6" -SRC_URI[iced.sha256sum] = "bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c" diff --git a/recipes-core/openjdk/openjdk-6_6b24-1.11.3.bb b/recipes-core/openjdk/openjdk-6_6b24-1.11.3.bb new file mode 100644 index 0000000..4485180 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6_6b24-1.11.3.bb @@ -0,0 +1,10 @@ +require openjdk-6-release-6b24.inc + +PR = "${INC_PR}.0" + +SRC_URI[iced.md5sum] = "52e0db92541296bdf43a4cfce135ac4f" +SRC_URI[iced.sha256sum] = "7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4" + +ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" + +DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" -- cgit v1.2.3-54-g00ecf