mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
. Update to 8u192.
PR: 230364
This commit is contained in:
parent
0f0117e583
commit
7fd2bcba96
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=486973
7 changed files with 1255 additions and 1101 deletions
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
PORTNAME= openjdk
|
PORTNAME= openjdk
|
||||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
|
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= java devel
|
CATEGORIES= java devel
|
||||||
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
|
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 \
|
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
|
||||||
|
@ -34,7 +33,8 @@ PATCHFILES= patch-8u05-b13.xz \
|
||||||
patch-8u152-b16.xz \
|
patch-8u152-b16.xz \
|
||||||
patch-8u162-b12.xz \
|
patch-8u162-b12.xz \
|
||||||
patch-8u172-b11.xz \
|
patch-8u172-b11.xz \
|
||||||
patch-8u181-b13.xz
|
patch-8u181-b13.xz \
|
||||||
|
patch-8u192-b26.xz
|
||||||
|
|
||||||
MAINTAINER= java@FreeBSD.org
|
MAINTAINER= java@FreeBSD.org
|
||||||
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
|
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
|
||||||
|
@ -206,8 +206,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE}
|
||||||
NOPRECIOUSMAKEVARS= yes
|
NOPRECIOUSMAKEVARS= yes
|
||||||
|
|
||||||
JDK_MAJOR_VERSION= 8
|
JDK_MAJOR_VERSION= 8
|
||||||
JDK_UPDATE_VERSION= 181
|
JDK_UPDATE_VERSION= 192
|
||||||
JDK_BUILD_NUMBER= 13
|
JDK_BUILD_NUMBER= 26
|
||||||
DIST_BUILD_NUMBER= 132
|
DIST_BUILD_NUMBER= 132
|
||||||
JTREG_VERSION= 4.1
|
JTREG_VERSION= 4.1
|
||||||
JTREG_BUILD_NUMBER= b08
|
JTREG_BUILD_NUMBER= b08
|
||||||
|
|
|
@ -49,3 +49,5 @@ SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b8
|
||||||
SIZE (patch-8u172-b11.xz) = 146716
|
SIZE (patch-8u172-b11.xz) = 146716
|
||||||
SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839
|
SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839
|
||||||
SIZE (patch-8u181-b13.xz) = 69096
|
SIZE (patch-8u181-b13.xz) = 69096
|
||||||
|
SHA256 (patch-8u192-b26.xz) = 5bfa782ec2af8ddc6aed3e8de81cc37c7f375ebad650341d1ce74956c82a411e
|
||||||
|
SIZE (patch-8u192-b26.xz) = 284164
|
||||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,11 +1,14 @@
|
||||||
--- configure
|
--- configure.orig 2018-12-02 13:45:44.142931000 -0800
|
||||||
+++ configure
|
+++ configure 2018-12-02 15:16:05.112400000 -0800
|
||||||
@@ -26,4 +26,7 @@
|
@@ -29,6 +29,10 @@
|
||||||
# make sure that is called using bash.
|
|
||||||
|
|
||||||
this_script_dir=`dirname $0`
|
this_script_dir=`dirname $0`
|
||||||
-bash $this_script_dir/common/autoconf/configure "$@"
|
this_script_dir=`cd $this_script_dir > /dev/null && pwd`
|
||||||
|
|
||||||
+export CONFIG_SHELL=%%LOCALBASE%%/bin/bash
|
+export CONFIG_SHELL=%%LOCALBASE%%/bin/bash
|
||||||
+export MAKE=%%LOCALBASE%%/bin/gmake
|
+export MAKE=%%LOCALBASE%%/bin/gmake
|
||||||
+export OBJCOPY=%%OBJCOPY%%
|
+export OBJCOPY=%%OBJCOPY%%
|
||||||
+%%LOCALBASE%%/bin/bash $this_script_dir/common/autoconf/configure "$@"
|
+
|
||||||
|
# Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
|
||||||
|
# This trick is needed to get autoconf to co-operate properly.
|
||||||
|
-bash -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
|
||||||
|
+%%LOCALBASE%%/bin/bash -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
--- hotspot/make/bsd/makefiles/vm.make.orig
|
|
||||||
+++ hotspot/make/bsd/makefiles/vm.make
|
|
||||||
@@ -132,6 +132,10 @@ LIBS += -lm
|
|
||||||
|
|
||||||
ifeq ($(USE_CLANG),)
|
|
||||||
LIBS += -pthread
|
|
||||||
+else
|
|
||||||
+ ifneq ($(OS_VENDOR), Darwin)
|
|
||||||
+ LIBS += -pthread
|
|
||||||
+ endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# By default, link the *.o into the library, not the executable.
|
|
|
@ -1,20 +1,23 @@
|
||||||
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700
|
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2018-12-02 16:06:28.335527000 -0800
|
||||||
+++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700
|
+++ jdk/make/lib/Awt2dLibraries.gmk 2018-12-02 16:29:22.253979000 -0800
|
||||||
@@ -1259,7 +1259,7 @@
|
@@ -1236,6 +1236,11 @@
|
||||||
else ifeq ($(OPENJDK_TARGET_OS), bsd)
|
LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
|
||||||
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
|
LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
|
||||||
ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
|
|
||||||
- LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
|
+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||||
|
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
|
||||||
|
+ ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
|
||||||
+ LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%%
|
+ LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%%
|
||||||
endif
|
+ endif
|
||||||
|
else ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||||
|
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
|
||||||
else
|
else
|
||||||
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
|
@@ -1257,6 +1262,8 @@
|
||||||
@@ -1285,7 +1285,7 @@
|
-framework JavaNativeFoundation
|
||||||
# Solaris still uses OPENWIN_LIB ..
|
else ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||||
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
|
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
|
||||||
else ifeq ($(OPENJDK_TARGET_OS), bsd)
|
+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||||
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
|
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
|
||||||
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
|
|
||||||
else # .. all other Unixes can use X_LIBS
|
else # .. all other Unixes can use X_LIBS
|
||||||
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
|
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue