mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

. Update to 8u25.

Browse Source
This commit is contained in:
Greg Lewis 2014-11-09 05:23:31 +00:00
parent d7d152e067
commit ec0ba98b99
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=372338
15 changed files with 414678 additions and 1402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/openjdk8-jre/Makefile
View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 5
PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre
COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION}

49
java/openjdk8/Makefile
View File

@ -2,7 +2,6 @@
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 \
@ -38,6 +37,15 @@ ONLY_FOR_ARCHS= i386 amd64
WRKSRC= ${WRKDIR}/${PORTNAME}
DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \
jdk/src/bsd/doc/man/java.1 \
jdk/src/bsd/doc/man/javac.1 \
jdk/src/bsd/doc/man/javap.1 \
jdk/src/linux/doc/man/java.1 \
jdk/src/linux/doc/man/javac.1 \
jdk/src/linux/doc/man/javap.1 \
jdk/src/solaris/doc/sun/man/man1/java.1 \
jdk/src/solaris/doc/sun/man/man1/javac.1 \
jdk/src/solaris/doc/sun/man/man1/javap.1 \
nashorn/test/script/jfx.js
SHEBANG_FILES= configure
@ -62,8 +70,8 @@ NO_CCACHE= yes
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
JDK_UPDATE_VERSION= 11
JDK_BUILD_NUMBER= 12
JDK_UPDATE_VERSION= 25
JDK_BUILD_NUMBER= 17
DIST_BUILD_NUMBER= 132
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
@ -163,33 +171,20 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB}
.endif
post-extract:
@${MV} -f ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug \
${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx
@${MV} -f ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product \
${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product.macosx
@${CP} -f ${WRKSRC}/hotspot/make/linux/makefiles/mapfile-vers-debug \
${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug
@${CP} -f ${WRKSRC}/hotspot/make/linux/makefiles/mapfile-vers-product \
${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product
@${MKDIR} ${WRKSRC}/jdk/src/bsd/classes/java/net \
${WRKSRC}/jdk/src/bsd/classes/sun/nio/ch
@${MV} -f ${WRKSRC}/jdk/src/macosx/classes/java/net/DefaultInterface.java \
${WRKSRC}/jdk/src/bsd/classes/java/net
@${MV} -f ${WRKSRC}/jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java \
${WRKSRC}/jdk/src/bsd/classes/sun/nio/ch
@${MV} -f ${WRKSRC}/jdk/src/macosx/classes/sun/nio/ch/KQueue*.java \
${WRKSRC}/jdk/src/solaris/classes/sun/nio/ch
@${MV} -f ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch/KQueue*.c \
${WRKSRC}/jdk/src/solaris/native/sun/nio/ch
@${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \
${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg
@${CP} ${FILESDIR}/nashorn-test-script-jfx-flyingimage-golden-bsd.png \
${WRKSRC}/nashorn/test/script/jfx/flyingimage/golden/bsd.png
@${CP} ${FILESDIR}/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png \
${WRKSRC}/nashorn/test/script/jfx/kaleidoscope/golden/bsd.png
@${CP} ${FILESDIR}/nashorn-test-script-jfx-spread-golden-bsd.png \
${WRKSRC}/nashorn/test/script/jfx/spread/golden/bsd.png
post-patch:
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${RMDIR} ${WRKSRC}/jdk/src/macosx/classes/java/net \
${WRKSRC}/jdk/src/macosx/native/sun/nio/ch \
${WRKSRC}/jdk/src/macosx/native/sun/nio
@${CP} -f ${WRKSRC}/jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd \
${WRKSRC}/jdk/src/solaris/classes/java/lang/UNIXProcess.java.macosx
@${CP} -f ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \
${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg
post-patch:
@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${FILESDIR}/bsd.fontconfig.properties.in > \
${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties

BIN
java/openjdk8/files/nashorn-test-script-jfx-flyingimage-golden-bsd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 67 KiB

BIN
java/openjdk8/files/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 KiB

BIN
java/openjdk8/files/nashorn-test-script-jfx-spread-golden-bsd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 KiB

404059
java/openjdk8/files/patch-8u20-b26 Normal file
View File

File diff suppressed because it is too large Load Diff

5306
java/openjdk8/files/patch-8u25-b17 Normal file
View File

File diff suppressed because it is too large Load Diff

5705
java/openjdk8/files/patch-bsd
View File

File diff suppressed because it is too large Load Diff

866
java/openjdk8/files/patch-bsd-test
View File

File diff suppressed because it is too large Load Diff

18
java/openjdk8/files/patch-common-autoconf-toolchain.m4
View File

@ -1,11 +1,11 @@
--- common/autoconf/toolchain.m4.orig 2014-04-26 00:48:48.000000000 -0400
+++ common/autoconf/toolchain.m4 2014-04-26 00:49:35.000000000 -0400
@@ -885,7 +885,7 @@
CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
--- common/autoconf/toolchain.m4.orig 2014-11-08 19:52:00.000000000 -0800
+++ common/autoconf/toolchain.m4 2014-11-08 19:52:15.000000000 -0800
@@ -971,7 +971,7 @@
fi
# The package path is used only on macosx?
- PACKAGE_PATH=/opt/local
+ PACKAGE_PATH=%%LOCALBASE%%
AC_SUBST(PACKAGE_PATH)
if test "`uname -s`" = "FreeBSD"; then
- PACKAGE_PATH=/usr/local
+ PACKAGE_PATH=%%LOCALBASE%%
fi
if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
if test "`uname -s`" = "NetBSD"; then

11
java/openjdk8/files/patch-hotspot__make__bsd__makefiles__adjust-mflags.sh
View File

@ -1,11 +0,0 @@
--- hotspot/make/bsd/makefiles/adjust-mflags.sh.orig 2014-03-04 02:52:06 UTC
+++ hotspot/make/bsd/makefiles/adjust-mflags.sh
@@ -64,7 +64,7 @@
echo "$MFLAGS" \
| sed '
s/^-/ -/
- s/ -\([^ ][^ ]*\)j/ -\1 -j/
+ s/ -\([^ I][^ I]*\)j/ -\1 -j/
s/ -j[0-9][0-9]*/ -j/
s/ -j\([^ ]\)/ -j -\1/
s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/

16
java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
View File

@ -1,19 +1,19 @@
--- jdk/make/lib/Awt2dLibraries.gmk
+++ jdk/make/lib/Awt2dLibraries.gmk
@@ -1243,6 +1243,8 @@
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2014-11-08 19:54:51.000000000 -0800
+++ jdk/make/lib/Awt2dLibraries.gmk 2014-11-08 19:56:30.000000000 -0800
@@ -1257,7 +1257,7 @@
else ifeq ($(OPENJDK_TARGET_OS), solaris)
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) %%ICONV_CPPFLAGS%%
else ifeq ($(OPENJDK_TARGET_OS), bsd)
- LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -DLIBICONV_PLUG
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%
else
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
endif
@@ -1267,7 +1269,7 @@
@@ -1282,7 +1282,7 @@
# Solaris still uses OPENWIN_LIB ..
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
else ifeq ($(OPENJDK_TARGET_OS), bsd)
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -liconv -pthread
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -pthread
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
else # .. all other Unixes can use X_LIBS
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread

11
java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
View File

@ -1,14 +1,15 @@
--- jdk/make/lib/CoreLibraries.gmk
+++ jdk/make/lib/CoreLibraries.gmk
@@ -496,10 +496,11 @@
--- jdk/make/lib/CoreLibraries.gmk.orig 2014-11-08 19:58:00.000000000 -0800
+++ jdk/make/lib/CoreLibraries.gmk 2014-11-08 19:58:38.000000000 -0800
@@ -516,11 +516,11 @@
CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/npt \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
- CFLAGS_bsd := -DLIBICONV_PLUG, \
+ CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_bsd := -liconv, \
- LDFLAGS_bsd := , \
+ LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \
LDFLAGS_macosx := -liconv, \
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \

27
java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
View File

@ -1,19 +1,20 @@
--- jdk/make/lib/ServiceabilityLibraries.gmk
+++ jdk/make/lib/ServiceabilityLibraries.gmk
@@ -244,6 +244,7 @@
--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2014-11-08 19:59:40.000000000 -0800
+++ jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-08 20:00:50.000000000 -0800
@@ -252,7 +252,7 @@
CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
CFLAGS_debug := -DJPLIS_LOGGING, \
CFLAGS_release := -DNO_JPLIS_LOGGING, \
+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
- CFLAGS_bsd := -DLIBICONV_PLUG, \
+ CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \
@@ -258,7 +259,7 @@
LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
- LDFLAGS_SUFFIX_bsd := -liconv $(LIBZ), \
+ LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=instrument.dll" \
@@ -260,7 +260,7 @@
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
- -Xlinker --no-whole-archive, \
+ -Xlinker --no-whole-archive %%ICONV_LDFLAGS%% $(LIBZ), \
LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
-framework Cocoa -framework Security -framework ApplicationServices, \
LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \

11
java/openjdk8/files/patch-make-common-MakeBase.gmk
View File

@ -1,11 +0,0 @@
--- make/common/MakeBase.gmk.orig 2014-07-05 17:17:35.000000000 -0700
+++ make/common/MakeBase.gmk 2014-07-05 17:17:51.000000000 -0700
@@ -338,7 +338,7 @@
# (and causing a crash on Cygwin).
# Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
# Only use time if it's GNU time which supports format and output file.
- WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
+ WRAPPER_SHELL:=bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log bash
SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
endif
# Never remove warning messages; this is just for completeness