diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch')
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch new file mode 100644 index 0000000..5eccc68 --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch @@ -0,0 +1,60 @@ +Index: icedtea-2.3.12/Makefile.am +=================================================================== +--- icedtea-2.3.12.orig/Makefile.am 2013-07-26 18:17:45.499466367 +0000 ++++ icedtea-2.3.12/Makefile.am 2013-07-30 21:04:46.761410713 +0000 +@@ -471,6 +471,12 @@ + 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)" \ + QUIETLY="" \ + ANT_RESPECT_JAVA_HOME="TRUE" \ + DISTRIBUTION_ID="$(DIST_ID)" \ +@@ -2028,7 +2034,11 @@ + if BUILD_JAMVM + cd jamvm/jamvm && \ + ./autogen.sh --with-java-runtime-library=openjdk7 \ +- --prefix=$(abs_top_builddir)/jamvm/install ; \ ++ --prefix=$(abs_top_builddir)/jamvm/install \ ++ --host=$(host_alias) \ ++ --build=$(build_alias) \ ++ --target=$(target_alias) \ ++ --with-libtool-sysroot ; \ + $(MAKE) ; \ + $(MAKE) install + mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server +@@ -2093,6 +2103,7 @@ + --host=$(host_alias) \ + --build=$(build_alias) \ + --target=$(target_alias) \ ++ --with-libtool-sysroot \ + --prefix=$(abs_top_builddir)/cacao/install \ + --with-java-runtime-library=openjdk7 \ + --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ +@@ -2160,7 +2171,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 \ + --disable-bootstrap --enable-zero + if ADD_SHARK_BUILD + ADD_ZERO_CONFIGURE_ARGS += \ +Index: icedtea-2.3.12/javac.in +=================================================================== +--- icedtea-2.3.12.orig/javac.in 2013-07-24 21:33:57.224612327 +0000 ++++ icedtea-2.3.12/javac.in 2013-07-30 19:41:56.240277496 +0000 +@@ -77,5 +77,7 @@ + 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; + } |