svn commit: r497173 - in head/java/openjdk12: . files
Greg Lewis
glewis at FreeBSD.org
Fri Mar 29 17:39:17 UTC 2019
Author: glewis
Date: Fri Mar 29 17:39:15 2019
New Revision: 497173
URL: https://svnweb.freebsd.org/changeset/ports/497173
Log:
* Update to 12.0.0.33.2
* Sort LIB_DEPENDS and USE_XORG.
* Add a dependency in alsa-lib now that sound is supported on FreeBSD.
* Don't disable dtrace now that it is supported on FreeBSD.
* Less intrusive iconv change.
Added:
head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk
- copied unchanged from r497169, head/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk
head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp
- copied, changed from r497064, head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp
Modified:
head/java/openjdk12/Makefile
head/java/openjdk12/distinfo
head/java/openjdk12/files/patch-make_autoconf_libraries.m4
Modified: head/java/openjdk12/Makefile
==============================================================================
--- head/java/openjdk12/Makefile Fri Mar 29 17:30:07 2019 (r497172)
+++ head/java/openjdk12/Makefile Fri Mar 29 17:39:15 2019 (r497173)
@@ -2,7 +2,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= https://github.com/battleblow/openjdk-jdk12u/archive/
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
@@ -19,26 +18,24 @@ BUILD_DEPENDS= zip:archivers/zip \
autoconf>0:devel/autoconf \
${LOCALBASE}/include/cups/cups.h:print/cups \
bash:shells/bash
-LIB_DEPENDS= libfreetype.so:print/freetype2 \
+LIB_DEPENDS= libasound.so:audio/alsa-lib \
libfontconfig.so:x11-fonts/fontconfig \
- liblcms2.so:graphics/lcms2 \
+ libfreetype.so:print/freetype2 \
libgif.so:graphics/giflib \
+ liblcms2.so:graphics/lcms2 \
libpng16.so:graphics/png
USES= compiler:features gmake iconv jpeg pkgconfig
-USE_XORG= xext x11 xrender xtst xi xt xrandr
+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}
_MAKE_JOBS= #
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= LANG="C" \
LC_ALL="C" \
CLASSPATH="" \
JAVA_HOME="" \
LD_LIBRARY_PATH="" \
- LDFLAGS=-L${LOCALBASE}/lib \
CC=/usr/bin/cc \
CXX=/usr/bin/c++ \
MAKEFLAGS="" \
@@ -55,14 +52,13 @@ JDK_MAJOR_VERSION= 12
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 0
JDK_BUILD_NUMBER= 33
-BSD_JDK_VERSION= 1
+BSD_JDK_VERSION= 2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC=/usr/bin/cc \
CXX=/usr/bin/c++
CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
--disable-ccache \
- --disable-dtrace \
--disable-javac-server \
--disable-hotspot-gtest \
--with-alsa=${LOCALBASE} \
@@ -73,16 +69,14 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
--with-freetype-lib=${LOCALBASE}/lib \
--with-libjpeg=system \
--with-giflib=system \
+ --with-giflib-include=${LOCALBASE}/include \
+ --with-giflib-lib=${LOCALBASE}/lib \
--with-libpng=system \
--with-zlib=system \
--with-lcms=system \
- --with-extra-cflags=-I${LOCALBASE}/include \
- --with-extra-cxxflags=-I${LOCALBASE}/include \
- --with-extra-ldflags=-L${LOCALBASE}/lib \
--with-toolchain-type=clang \
--x-includes=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib \
- --with-package-path=${LOCALBASE} \
--with-cacerts-file=${FILESDIR}/cacerts \
--with-version-string=${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
--with-native-debug-symbols=none \
@@ -126,7 +120,8 @@ post-patch:
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${CHMOD} 755 ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure \
+ ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp
@${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \
-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
Modified: head/java/openjdk12/distinfo
==============================================================================
--- head/java/openjdk12/distinfo Fri Mar 29 17:30:07 2019 (r497172)
+++ head/java/openjdk12/distinfo Fri Mar 29 17:39:15 2019 (r497173)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553131068
-SHA256 (jdk-12+33-1.tar.gz) = a1aae0dc0adbb00c9733b91276a6f739e3dc234fd4c019fe7ee3f4e323fbe67f
-SIZE (jdk-12+33-1.tar.gz) = 110195427
+TIMESTAMP = 1553839427
+SHA256 (jdk-12+33-2.tar.gz) = b4eb145fa003a3cfee945056a65bf4f00be00c765f3a2810218b6178bceccf95
+SIZE (jdk-12+33-2.tar.gz) = 110233939
Modified: head/java/openjdk12/files/patch-make_autoconf_libraries.m4
==============================================================================
--- head/java/openjdk12/files/patch-make_autoconf_libraries.m4 Fri Mar 29 17:30:07 2019 (r497172)
+++ head/java/openjdk12/files/patch-make_autoconf_libraries.m4 Fri Mar 29 17:39:15 2019 (r497173)
@@ -1,19 +1,15 @@
---- make/autoconf/libraries.m4
-+++ make/autoconf/libraries.m4
-@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
- LIBS="$save_LIBS"
-
- if test "x$OPENJDK_TARGET_OS" = "xbsd"; then
-- if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
-- ICONV_CFLAGS="-I$PACKAGE_PATH/include"
-- ICONV_LDFLAGS="-L$PACKAGE_PATH/lib"
-+ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+--- make/autoconf/libraries.m4.orig 2019-03-28 16:54:58.823145000 -0700
++++ make/autoconf/libraries.m4 2019-03-28 16:55:45.533206000 -0700
+@@ -186,9 +186,9 @@
+ ICONV_LDFLAGS="-L/usr/local/lib"
+ ICONV_LIBS=-liconv
+ else
+- ICONV_CFLAGS=
+- ICONV_LDFLAGS=
+- ICONV_LIBS=
+ ICONV_CFLAGS=%%ICONV_CFLAGS%%
+ ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
+ ICONV_LIBS=%%ICONV_LIBS%%
-+ elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
-+ ICONV_CFLAGS="-I/usr/local/include"
-+ ICONV_LDFLAGS="-L/usr/local/lib"
- ICONV_LIBS=-liconv
- else
- ICONV_CFLAGS=
+ fi
+ else
+ ICONV_CFLAGS=
Copied: head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk (from r497169, head/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk Fri Mar 29 17:39:15 2019 (r497173, copy of r497169, head/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk)
@@ -0,0 +1,18 @@
+--- 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.
Copied and modified: head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp (from r497064, head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp)
==============================================================================
--- head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp Fri Mar 29 01:05:26 2019 (r497064, copy source)
+++ head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp Fri Mar 29 17:39:15 2019 (r497173)
@@ -1,11 +1,11 @@
---- src/hotspot/os/bsd/os_bsd.cpp.orig 2019-03-27 13:28:54.000000000 -0700
-+++ src/hotspot/os/bsd/os_bsd.cpp 2019-03-28 16:46:31.000797000 -0700
-@@ -380,7 +380,7 @@
- #elif defined(__NetBSD__)
- #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
- #else
-- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
-+ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
- #endif
- #endif
-
+--- src/hotspot/os/bsd/os_bsd.cpp.orig 2019-03-28 21:47:08.000000000 -0700
++++ src/hotspot/os/bsd/os_bsd.cpp 2019-03-28 23:08:55.590922000 -0700
+@@ -361,7 +361,7 @@
+ #elif defined(__NetBSD__)
+ #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
+ #else
+- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
++ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
+ #endif
+ #else
+ #define DEFAULT_LIBPATH OVERRIDE_LIBPATH
More information about the svn-ports-all
mailing list