mirror of
https://git.freebsd.org/ports.git
synced 2025-05-12 23:31:50 -04:00
. Update to 12.0.1
This commit is contained in:
parent
bf22c2860b
commit
083a6da42d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=499213
3 changed files with 8 additions and 26 deletions
|
@ -5,7 +5,7 @@ PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JD
|
||||||
CATEGORIES= java devel
|
CATEGORIES= java devel
|
||||||
MASTER_SITES= https://github.com/battleblow/openjdk-jdk12u/archive/
|
MASTER_SITES= https://github.com/battleblow/openjdk-jdk12u/archive/
|
||||||
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
|
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
|
MAINTAINER= java@FreeBSD.org
|
||||||
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
|
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
|
USES= compiler:features gmake iconv jpeg pkgconfig
|
||||||
USE_XORG= x11 xext xi xrandr xrender xt xtst
|
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_JOBS= #
|
||||||
MAKE_ENV= LANG="C" \
|
MAKE_ENV= LANG="C" \
|
||||||
|
@ -50,9 +50,9 @@ NOPRECIOUSMAKEVARS= yes
|
||||||
|
|
||||||
JDK_MAJOR_VERSION= 12
|
JDK_MAJOR_VERSION= 12
|
||||||
JDK_MINOR_VERSION= 0
|
JDK_MINOR_VERSION= 0
|
||||||
JDK_PATCH_VERSION= 0
|
JDK_PATCH_VERSION= 1
|
||||||
JDK_BUILD_NUMBER= 33
|
JDK_BUILD_NUMBER= 12
|
||||||
BSD_JDK_VERSION= 2
|
BSD_JDK_VERSION= 1
|
||||||
|
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
CONFIGURE_ENV= CC=/usr/bin/cc \
|
CONFIGURE_ENV= CC=/usr/bin/cc \
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1553839427
|
TIMESTAMP = 1555525600
|
||||||
SHA256 (jdk-12+33-2.tar.gz) = b4eb145fa003a3cfee945056a65bf4f00be00c765f3a2810218b6178bceccf95
|
SHA256 (jdk-12.0.1+12-1.tar.gz) = f398da1f0eb7b8dea409061d38e04210254de51e1cb06480baa61fb171a1d4e2
|
||||||
SIZE (jdk-12+33-2.tar.gz) = 110233939
|
SIZE (jdk-12.0.1+12-1.tar.gz) = 110249732
|
||||||
|
|
|
@ -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.
|
|
Loading…
Add table
Reference in a new issue