diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-30 16:30:36 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-10-30 16:30:36 +0000 |
| commit | b81354a1df44aadb4fab9ef265ac10579dd1f797 (patch) | |
| tree | e0807c0b5b16bf8dead7edfe47fb4b139f39668b /java | |
| parent | 18e4ea1312353c9d61241942b27bdf2059f813eb (diff) | |
| download | ports-b81354a1df44aadb4fab9ef265ac10579dd1f797.tar.gz ports-b81354a1df44aadb4fab9ef265ac10579dd1f797.zip | |
Merge Linux-specific changes to BSD patches. Most importantly, this change
corrects 'os.arch' property for i386 to fix regressions.
PR: 194419
Notes
Notes:
svn path=/head/; revision=371759
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk8-jre/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk8/Makefile | 3 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-bsd | 23 |
3 files changed, 25 insertions, 3 deletions
diff --git a/java/openjdk8-jre/Makefile b/java/openjdk8-jre/Makefile index ff4c2e86856d..2f8e4d59b53b 100644 --- a/java/openjdk8-jre/Makefile +++ b/java/openjdk8-jre/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} 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 @@ |