diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-04-17 20:57:53 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-04-17 20:57:53 +0000 |
| commit | 083a6da42dac1e8793bacae06dc747e155821897 (patch) | |
| tree | 7163b8e94d0621c733b8e2bc67efb8e002435a48 /java/openjdk12 | |
| parent | bf22c2860b6488b97fb0143945ad55f6dc35486d (diff) | |
| download | ports-083a6da42dac1e8793bacae06dc747e155821897.tar.gz ports-083a6da42dac1e8793bacae06dc747e155821897.zip | |
. Update to 12.0.1
Notes
Notes:
svn path=/head/; revision=499213
Diffstat (limited to 'java/openjdk12')
| -rw-r--r-- | java/openjdk12/Makefile | 10 | ||||
| -rw-r--r-- | java/openjdk12/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk | 18 |
3 files changed, 8 insertions, 26 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index 5fd27d22bfc5..49fb7a40fc10 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -5,7 +5,7 @@ PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JD CATEGORIES= java devel MASTER_SITES= https://github.com/battleblow/openjdk-jdk12u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -DISTNAME= jdk-${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +DISTNAME= jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} MAINTAINER= java@FreeBSD.org COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} @@ -28,7 +28,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ USES= compiler:features gmake iconv jpeg pkgconfig USE_XORG= x11 xext xi xrandr xrender xt xtst -WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} _MAKE_JOBS= # MAKE_ENV= LANG="C" \ @@ -50,9 +50,9 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 12 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 0 -JDK_BUILD_NUMBER= 33 -BSD_JDK_VERSION= 2 +JDK_PATCH_VERSION= 1 +JDK_BUILD_NUMBER= 12 +BSD_JDK_VERSION= 1 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=/usr/bin/cc \ diff --git a/java/openjdk12/distinfo b/java/openjdk12/distinfo index e2412f26b230..5bab45027656 100644 --- a/java/openjdk12/distinfo +++ b/java/openjdk12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553839427 -SHA256 (jdk-12+33-2.tar.gz) = b4eb145fa003a3cfee945056a65bf4f00be00c765f3a2810218b6178bceccf95 -SIZE (jdk-12+33-2.tar.gz) = 110233939 +TIMESTAMP = 1555525600 +SHA256 (jdk-12.0.1+12-1.tar.gz) = f398da1f0eb7b8dea409061d38e04210254de51e1cb06480baa61fb171a1d4e2 +SIZE (jdk-12.0.1+12-1.tar.gz) = 110249732 diff --git a/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk b/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk deleted file mode 100644 index a3bc5762dedb..000000000000 --- a/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk +++ /dev/null @@ -1,18 +0,0 @@ ---- make/hotspot/lib/JvmDtraceObjects.gmk -+++ make/hotspot/lib/JvmDtraceObjects.gmk -@@ -201,8 +201,13 @@ ifeq ($(call check-jvm-feature, dtrace), true) - ) - endif - -- DTRACE_FLAGS := -64 -G -- DTRACE_CPP_FLAGS := -D_LP64 -x c -+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) -+ DTRACE_FLAGS := -32 -G -+ DTRACE_CPP_FLAGS := -x c -+ else -+ DTRACE_FLAGS := -64 -G -+ DTRACE_CPP_FLAGS := -D_LP64 -x c -+ endif - - # Make sure we run our selected compiler for preprocessing instead of letting - # the dtrace tool pick it on it's own. |