Permalink
Browse files

openjdk: backport 1.11.1 release from meta-java

* shark is disabled since 1.11
* rework patches
* rework inc files for jamvm
* bump PR
  • Loading branch information...
1 parent 6d8534e commit 5d1acefd6bc07176437ebbbaef01cdc33779589e Henning Heinold committed Feb 17, 2012
Showing with 2,439 additions and 66 deletions.
  1. +79 −0 recipes/openjdk/openjdk-6-6b24/build-hacks.patch
  2. +12 −0 recipes/openjdk/openjdk-6-6b24/cacao-libtoolize.patch
  3. +12 −0 recipes/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch
  4. +27 −0 recipes/openjdk/openjdk-6-6b24/cacao-loadavg.patch
  5. +51 −0 recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch
  6. +216 −0 recipes/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch
  7. +13 −0 recipes/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch
  8. +12 −0 recipes/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch
  9. +16 −0 recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch
  10. +23 −0 recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch
  11. +15 −0 recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch
  12. +21 −0 recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch
  13. +28 −0 recipes/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch
  14. +39 −0 recipes/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch
  15. +41 −0 recipes/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch
  16. +12 −0 recipes/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch
  17. +13 −0 recipes/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
  18. +148 −0 recipes/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch
  19. +14 −0 recipes/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch
  20. +113 −0 recipes/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch
  21. +18 −0 recipes/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch
  22. +41 −0 recipes/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
  23. +43 −0 recipes/openjdk/openjdk-6-6b24/jvm.cfg
  24. +97 −66 recipes/openjdk/openjdk-6-common.inc
  25. +115 −0 recipes/openjdk/openjdk-6-release-6b24.inc
  26. +31 −0 recipes/openjdk/openjdk-6/build-hacks.patch
  27. +12 −0 recipes/openjdk/openjdk-6/cacao-disable-stackbase-check.patch
  28. +18 −0 recipes/openjdk/openjdk-6/cacao-libtoolize.patch
  29. +37 −0 recipes/openjdk/openjdk-6/cacao-vfp-compat.patch
  30. +13 −0 recipes/openjdk/openjdk-6/fix-llvm-libs.patch
  31. +94 −0 recipes/openjdk/openjdk-6/fix_hotspot_crosscompile.patch
  32. +229 −0 recipes/openjdk/openjdk-6/icedtea-crosscompile-fix.patch
  33. +13 −0 recipes/openjdk/openjdk-6/icedtea-fix-jar-command.patch
  34. +131 −0 recipes/openjdk/openjdk-6/icedtea-hasgettransfer.patch
  35. +12 −0 recipes/openjdk/openjdk-6/icedtea-hostbuildcc.patch
  36. +23 −0 recipes/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch
  37. +15 −0 recipes/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch
  38. +21 −0 recipes/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch
  39. +28 −0 recipes/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch
  40. +13 −0 recipes/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch
  41. +39 −0 recipes/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch
  42. +41 −0 recipes/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch
  43. +12 −0 recipes/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch
  44. +13 −0 recipes/openjdk/openjdk-6/icedtea-launcher-stdc++.patch
  45. +148 −0 recipes/openjdk/openjdk-6/icedtea-libnet-renaming.patch
  46. +29 −0 recipes/openjdk/openjdk-6/icedtea-llvm_headers.patch
  47. +14 −0 recipes/openjdk/openjdk-6/icedtea-remove_werror.patch
  48. +18 −0 recipes/openjdk/openjdk-6/icedtea-unbreak-float.patch
  49. +41 −0 recipes/openjdk/openjdk-6/jvm.cfg
  50. +11 −0 recipes/openjdk/openjdk-6/mkbc_returncode.patch
  51. +113 −0 recipes/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch
  52. +13 −0 recipes/openjdk/openjdk-6/shark-build-openjdkdir.patch
  53. +20 −0 recipes/openjdk/openjdk-6/zero-cmpswap-long.patch
  54. +18 −0 recipes/openjdk/openjdk-6_6b24-1.11.1.bb
@@ -0,0 +1,79 @@
+Index: icedtea6/Makefile.am
+===================================================================
+--- icedtea6.orig/Makefile.am 2011-12-21 21:24:25.000000000 +0100
++++ icedtea6/Makefile.am 2011-12-21 22:50:11.649227590 +0100
+@@ -538,6 +538,11 @@
+ JAVAC="" \
+ JAVA_HOME="" \
+ JDK_HOME="" \
++ OE_CFLAGS="$(OE_CFLAGS)" \
++ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
++ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
++ OE_LDFLAGS="$(OE_LDFLAGS)" \
++ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
+ DISTRIBUTION_ID="$(DIST_ID)" \
+ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
+ DEBUG_CLASSFILES="true" \
+@@ -1851,12 +1856,16 @@
+ if BUILD_JAMVM
+ cd jamvm/jamvm && \
+ LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
+- ./autogen.sh --with-java-runtime-library=openjdk \
+- --prefix=$(abs_top_builddir)/jamvm/install ; \
+- $(MAKE) ; \
+- $(MAKE) install
++ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \
++ --prefix=/usr/lib \
++ --host=$(host_alias) \
++ --build=$(build_alias) \
++ --target=$(target_alias) \
++ --with-libtool-sysroot ; \
++ $(ARCH_PREFIX) $(MAKE) ; \
++ $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install
+ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+- cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
++ cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+ ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
+ touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
+ ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
+@@ -1874,7 +1883,7 @@
+ stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
+ if ADD_JAMVM_BUILD
+ mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
+- install -m 644 jamvm/install/lib/libjvm.so \
++ install -m 644 jamvm/install/usr/lib/lib/libjvm.so \
+ $(BUILD_JRE_ARCH_DIR)/jamvm/
+ printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ else
+@@ -1918,6 +1927,7 @@
+ --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 \
+@@ -1984,7 +1994,7 @@
+ # configure script arguments, quoted in single quotes
+ CONFIGURE_ARGS = @CONFIGURE_ARGS@
+ ADD_ZERO_CONFIGURE_ARGS = \
+- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
++ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
+ --enable-zero
+ if ADD_SHARK_BUILD
+ ADD_ZERO_CONFIGURE_ARGS += \
+Index: icedtea6/javac.in
+===================================================================
+--- icedtea6.orig/javac.in 2011-12-21 21:24:30.000000000 +0100
++++ icedtea6/javac.in 2011-12-21 22:44:25.860460813 +0100
+@@ -45,7 +45,9 @@
+ my @CLASSPATH = ('@ECJ_JAR@');
+ push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+ $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
++ # Compiling hotspot-tools consumes tons of memory and exceeds any default
++ # limits for jamvm and cacao.
++ exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
+ }
+ else
+ {
@@ -0,0 +1,12 @@
+Index: icedtea6/Makefile.am
+===================================================================
+--- icedtea6.orig/Makefile.am 2011-12-21 22:58:23.000000000 +0100
++++ icedtea6/Makefile.am 2011-12-21 23:00:21.405887186 +0100
+@@ -1922,6 +1922,7 @@
+ if BUILD_CACAO
+ if !USE_SYSTEM_CACAO
+ cd cacao/cacao && \
++ rm -f libtool && \
+ ./autogen.sh && \
+ $(ARCH_PREFIX) ./configure \
+ --host=$(host_alias) \
@@ -0,0 +1,12 @@
+Index: icedtea6/Makefile.am
+===================================================================
+--- icedtea6.orig/Makefile.am 2011-12-20 10:54:09.000000000 +0100
++++ icedtea6/Makefile.am 2011-12-20 11:49:12.810009279 +0100
+@@ -1921,6 +1921,7 @@
+ if BUILD_CACAO
+ if !USE_SYSTEM_CACAO
+ cd cacao/cacao && \
++ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \
+ rm -f libtool && \
+ ./autogen.sh && \
+ $(ARCH_PREFIX) ./configure \
@@ -0,0 +1,27 @@
+Index: cacao-cff92704c4e0/src/vm/os.hpp
+===================================================================
+--- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100
++++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100
+@@ -425,7 +425,21 @@
+ #if defined(HAVE_GETLOADAVG)
+ return ::getloadavg(loadavg, nelem);
+ #else
+-# error getloadavg not available
++ FILE *LOADAVG;
++ double avg[3] = { 0.0, 0.0, 0.0 };
++ int i, res = -1;;
++
++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
++ res = 0;
++ fclose(LOADAVG);
++ }
++
++ for (i = 0; (i < nelem) && (i < 3); i++) {
++ loadavg[i] = avg[i];
++ }
++
++ return res;
+ #endif
+ }
+
@@ -0,0 +1,51 @@
+Index: icedtea6/acinclude.m4
+===================================================================
+--- icedtea6.orig/acinclude.m4 2011-12-20 02:25:50.000000000 +0100
++++ icedtea6/acinclude.m4 2011-12-20 18:02:08.340386576 +0100
+@@ -928,6 +928,21 @@
+ AC_SUBST(ALT_CACAO_SRC_DIR)
+ ])
+
++AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
++[
++ AC_MSG_CHECKING(for compiler used for subsidiary programs)
++ AC_ARG_WITH([cc-for-build],
++ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
++ [
++ CC_FOR_BUILD="${withval}"
++ ],
++ [
++ CC_FOR_BUILD="\$(CC)"
++ ])
++ AC_MSG_RESULT(${CC_FOR_BUILD})
++ AC_SUBST(CC_FOR_BUILD)
++])
++
+ AC_DEFUN([IT_WITH_GCJ],
+ [
+ AC_MSG_CHECKING([whether to compile ecj natively])
+Index: icedtea6/Makefile.am
+===================================================================
+--- icedtea6.orig/Makefile.am 2011-12-20 17:59:27.000000000 +0100
++++ icedtea6/Makefile.am 2011-12-20 18:04:32.972312064 +0100
+@@ -538,6 +538,7 @@
+ JAVAC="" \
+ JAVA_HOME="" \
+ JDK_HOME="" \
++ CC_FOR_BUILD="$(CC_FOR_BUILD)" \
+ OE_CFLAGS="$(OE_CFLAGS)" \
+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
+Index: icedtea6/configure.ac
+===================================================================
+--- icedtea6.orig/configure.ac 2011-12-20 02:25:50.000000000 +0100
++++ icedtea6/configure.ac 2011-12-20 18:03:04.534043885 +0100
+@@ -18,6 +18,8 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+
++AC_CHECK_WITH_CC_FOR_BUILD
++
+ IT_FIND_TOOL([MAKE], [make])
+ IT_FIND_TOOL([GZIP], [gzip])
+ IT_FIND_TOOL([ANT], [ant])
Oops, something went wrong.

0 comments on commit 5d1acef

Please sign in to comment.