[oe-commits] Henning Heinold : openjdk-6: add version 1.8. 5 with security fixes AND libtool2.4 support for cacao build

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 55b455f28f7a2f8d5ad7a830245c4b6ceb1cd98f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=55b455f28f7a2f8d5ad7a830245c4b6ceb1cd98f

Author: Henning Heinold <heinold at inf.fu-berlin.de>
Date:   Fri Feb  4 18:57:44 2011 +0100

openjdk-6: add version 1.8.5 with security fixes AND libtool2.4 support for cacao build

---

 .../openjdk-6-6b18-1.8.5/cacao-libtoolize.patch    |   18 ++++++++++++++++++
 .../icedtea-fix-jar-command.patch                  |   13 +++++++++++++
 recipes/openjdk/openjdk-6_6b18-1.8.5.bb            |   15 +++++++++++++++
 3 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/recipes/openjdk/openjdk-6-6b18-1.8.5/cacao-libtoolize.patch b/recipes/openjdk/openjdk-6-6b18-1.8.5/cacao-libtoolize.patch
new file mode 100644
index 0000000..a153a32
--- /dev/null
+++ b/recipes/openjdk/openjdk-6-6b18-1.8.5/cacao-libtoolize.patch
@@ -0,0 +1,18 @@
+Index: icedtea6-1.8.5/Makefile.am
+===================================================================
+--- icedtea6-1.8.5.orig/Makefile.am	2011-02-04 18:29:58.826701224 +0100
++++ icedtea6-1.8.5/Makefile.am	2011-02-04 18:31:53.430016002 +0100
+@@ -1918,10 +1918,13 @@
+ if BUILD_CACAO
+ if !USE_SYSTEM_CACAO
+ 	cd cacao/cacao && \
++        rm -f libtool && \
++        autoreconf --verbose --install --force --no-recursive && \
+ 	$(ARCH_PREFIX) ./configure \
+ 	  --host=$(host_alias) \
+ 	  --build=$(build_alias) \
+ 	  --target=$(target_alias) \
++          --with-libtool-sysroot \
+ 	  --prefix=$(abs_top_builddir)/cacao/install \
+ 	  --with-java-runtime-library=openjdk \
+ 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff --git a/recipes/openjdk/openjdk-6-6b18-1.8.5/icedtea-fix-jar-command.patch b/recipes/openjdk/openjdk-6-6b18-1.8.5/icedtea-fix-jar-command.patch
new file mode 100644
index 0000000..59d806d
--- /dev/null
+++ b/recipes/openjdk/openjdk-6-6b18-1.8.5/icedtea-fix-jar-command.patch
@@ -0,0 +1,13 @@
+Index: icedtea6-1.8/Makefile.am
+===================================================================
+--- icedtea6-1.8.orig/Makefile.am	2010-06-17 10:29:13.654666801 +0200
++++ icedtea6-1.8/Makefile.am	2010-06-17 10:30:50.334670771 +0200
+@@ -1750,7 +1745,7 @@
+ stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
+ if WITH_RHINO
+ 	mkdir -p rhino/rhino.{old,new}
+-	(cd rhino/rhino.old ; jar xf $(RHINO_JAR))
++	(cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR))
+ 	$(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
+ 	  com.redhat.rewriter.ClassRewriter \
+ 	  $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
diff --git a/recipes/openjdk/openjdk-6_6b18-1.8.5.bb b/recipes/openjdk/openjdk-6_6b18-1.8.5.bb
new file mode 100644
index 0000000..72d6279
--- /dev/null
+++ b/recipes/openjdk/openjdk-6_6b18-1.8.5.bb
@@ -0,0 +1,15 @@
+require openjdk-6-release-6b18.inc
+
+PR = "${INC_PR}.1"
+
+FILESPATHPKG =. "openjdk-6-6b18-1.8.5:openjdk-6-6b18-1.8:"
+
+ICEDTEA = "icedtea6-1.8.5"
+
+OEPATCHES += " \
+              file://cacao-libtoolize.patch \
+             "
+
+
+SRC_URI[iced.md5sum] = "65b84d9dfd7845acab9b9226ea136546"
+SRC_URI[iced.sha256sum] = "1ee081368587507e7ea75bd3351be0eafadd3f7020930db68448bcec6fa5c452"