Date: Wed, 9 Dec 2015 21:23:02 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403432 - head/java/openjdk8/files Message-ID: <201512092123.tB9LN23A028500@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Dec 9 21:23:01 2015 New Revision: 403432 URL: https://svnweb.freebsd.org/changeset/ports/403432 Log: Add an upstream patch to fix build for some 32-bit platforms, i.e., java.lang.OutOfMemroryError. http://hg.openjdk.java.net/jdk8u/jdk8u/rev/f398f28e3112 Added: head/java/openjdk8/files/patch-common_autoconf_boot-jdk.m4 (contents, props changed) Added: head/java/openjdk8/files/patch-common_autoconf_boot-jdk.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-common_autoconf_boot-jdk.m4 Wed Dec 9 21:23:01 2015 (r403432) @@ -0,0 +1,28 @@ +--- common/autoconf/boot-jdk.m4.orig 2015-12-09 21:04:26 UTC ++++ common/autoconf/boot-jdk.m4 +@@ -289,6 +289,16 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK], + BOOT_JDK_SOURCETARGET="-source 7 -target 7" + AC_SUBST(BOOT_JDK_SOURCETARGET) + AC_SUBST(JAVAC_FLAGS) ++ ++ # Check if the boot jdk is 32 or 64 bit ++ if "$JAVA" -d64 -version > /dev/null 2>&1; then ++ BOOT_JDK_BITS="64" ++ else ++ BOOT_JDK_BITS="32" ++ fi ++ AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits]) ++ AC_MSG_RESULT([$BOOT_JDK_BITS]) ++ AC_SUBST(BOOT_JDK_BITS) + ]) + + AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], +@@ -323,7 +333,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR + + # Maximum amount of heap memory. + # Maximum stack size. +- if test "x$BUILD_NUM_BITS" = x32; then ++ if test "x$BOOT_JDK_BITS" = x32; then + JVM_MAX_HEAP=1100M + STACK_SIZE=768 + else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512092123.tB9LN23A028500>