aboutsummaryrefslogtreecommitdiffstats
path: root/java/openjdk8
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-10-31 00:30:36 +0800
committerjkim <jkim@FreeBSD.org>2014-10-31 00:30:36 +0800
commit5b416c52357df900b2d535e58d74ff0ed90c8af5 (patch)
treee0807c0b5b16bf8dead7edfe47fb4b139f39668b /java/openjdk8
parentb63d1ad42e789e5e605fd943a3e7e9d77684f8f2 (diff)
downloadfreebsd-ports-gnome-5b416c52357df900b2d535e58d74ff0ed90c8af5.tar.gz
freebsd-ports-gnome-5b416c52357df900b2d535e58d74ff0ed90c8af5.tar.zst
freebsd-ports-gnome-5b416c52357df900b2d535e58d74ff0ed90c8af5.zip
Merge Linux-specific changes to BSD patches. Most importantly, this change
corrects 'os.arch' property for i386 to fix regressions. PR: 194419
Diffstat (limited to 'java/openjdk8')
-rw-r--r--java/openjdk8/Makefile3
-rw-r--r--java/openjdk8/files/patch-bsd23
2 files changed, 24 insertions, 2 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 278a1fbb4c0e..e7ed0806c513 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,6 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
+PORTREVISION?= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -241,8 +242,6 @@ do-install:
@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
@${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
- @${FIND} ${STAGEDIR}${INSTALLDIR} -type d | ${SORT} -r | \
- ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${INSTALLDIR}/bin/java # ${JAVAVMS_COMMENT}'" >> ${TMPPLIST}
.include <bsd.port.post.mk>
diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd
index 1b5cd37f810f..fa4bb71fc78c 100644
--- a/java/openjdk8/files/patch-bsd
+++ b/java/openjdk8/files/patch-bsd
@@ -85,6 +85,29 @@
VAR_CPU=x86_64
VAR_CPU_ARCH=x86
VAR_CPU_BITS=64
+@@ -291,8 +291,8 @@
+
+ # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
+ OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
+- if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
+- # On linux only, we replace x86 with i386.
++ if test "x$OPENJDK_TARGET_OS" = xbsd -o "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
++ # On bsd and linux only, we replace x86 with i386.
+ OPENJDK_TARGET_CPU_OSARCH="i386"
+ elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+ # On all platforms except macosx, we replace x86_64 with amd64.
+@@ -336,9 +336,9 @@
+
+ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+ A_LP64="LP64:="
+- # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
++ # -D_LP64=1 is only set on bsd, linux and mac. Setting on windows causes diff in
+ # unpack200.exe
+- if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
++ if test "x$OPENJDK_TARGET_OS" = xbsd -o "x$OPENJDK_TARGET_OS" = xlinux -o "x$OPENJDK_TARGET_OS" = xmacosx; then
+ ADD_LP64="-D_LP64=1"
+ fi
+ fi
--- common/autoconf/toolchain.m4
+++ common/autoconf/toolchain.m4
@@ -63,7 +63,7 @@