Date: Fri, 19 Apr 2019 16:31:34 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499375 - in head/java/openjdk8: . files Message-ID: <201904191631.x3JGVYI2000355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Apr 19 16:31:33 2019 New Revision: 499375 URL: https://svnweb.freebsd.org/changeset/ports/499375 Log: * Update to 8u212. * Change master site to Github * Remove patches and Makefile fixes that have been upstreamed to Github Deleted: head/java/openjdk8/files/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg head/java/openjdk8/files/nashorn-test-script-jfx-flyingimage-golden-bsd.png head/java/openjdk8/files/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png head/java/openjdk8/files/nashorn-test-script-jfx-spread-golden-bsd.png head/java/openjdk8/files/patch-bsd head/java/openjdk8/files/patch-bsd-test head/java/openjdk8/files/patch-common_autoconf_build-performance.m4 head/java/openjdk8/files/patch-common_autoconf_generated-configure.sh head/java/openjdk8/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp head/java/openjdk8/files/patch-hotspot-src_cpu_zero_vm_methodHandles__zero.cpp head/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_gcc.make head/java/openjdk8/files/patch-hotspot_src_cpu_ppc_vm_vm_version_ppc.cpp head/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp head/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp head/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp head/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_globals__bsd.hpp head/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp head/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp head/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_arguments.cpp head/java/openjdk8/files/patch-jdk-src-share-native-sun-font-freetypeScaler.c head/java/openjdk8/files/patch-jdk-src-solaris-classes-native-java-net-NetworkInterface.c head/java/openjdk8/files/patch-jdk-src-solaris-native-java-io-UnixFileSystem_md.c head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-fs-UnixNativeDispatcher.c head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c Modified: head/java/openjdk8/Makefile head/java/openjdk8/distinfo head/java/openjdk8/files/cacerts head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Fri Apr 19 16:13:22 2019 (r499374) +++ head/java/openjdk8/Makefile Fri Apr 19 16:31:33 2019 (r499375) @@ -1,49 +1,20 @@ # $FreeBSD$ 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//}.${BSD_JDK_VERSION} 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 \ - LOCAL/jkim:jdk,jtreg +MASTER_SITES= https://github.com/battleblow/openjdk-jdk8u/archive/:jdk \ + LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -DISTNAME= ${PORTNAME}-${JDK_MAJOR_VERSION}-src-b${DIST_BUILD_NUMBER}-03_mar_2014 -DISTFILES= ${DISTNAME}.zip:jdk +DISTNAME= jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} +DISTFILES= ${DISTNAME}.tar.gz:jdk -PATCH_SITES= LOCAL/glewis/openjdk8 -PATCHFILES= patch-8u05-b13.xz \ - patch-8u11-b13.xz \ - patch-8u20-b26.xz \ - patch-8u25-b17.xz \ - patch-8u31-b13.xz \ - patch-8u40-b25.xz \ - patch-8u45-b14.xz \ - patch-8u51-b16.xz \ - patch-8u60-b23.xz \ - patch-8u66-b17-1.xz \ - patch-8u72-b15.xz \ - patch-8u74-b02.xz \ - patch-8u77-b03.xz \ - patch-8u92-b14.xz \ - patch-8u102-b14.xz \ - patch-8u112-b16.xz \ - patch-8u121-b13.xz \ - patch-8u131-b11.xz \ - patch-8u144-b01.xz \ - patch-8u152-b16.xz \ - patch-8u162-b12.xz \ - patch-8u172-b11.xz \ - patch-8u181-b13.xz \ - patch-8u192-b26.xz \ - patch-8u202-b08.xz - MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 -BUILD_DEPENDS= zip:archivers/zip \ - autoconf>0:devel/autoconf \ +BUILD_DEPENDS= autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash LIB_DEPENDS= libfreetype.so:print/freetype2 \ @@ -51,140 +22,11 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ RUN_DEPENDS= javavm:java/javavmwrapper \ dejavu>0:x11-fonts/dejavu -USES= compiler:features dos2unix gmake iconv pkgconfig \ - shebangfix +USES= compiler:features gmake iconv pkgconfig shebangfix -.if !exists(/usr/bin/unzip) -BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip -.endif - ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-${DISTNAME} -DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \ - jdk/src/bsd/doc/man/extcheck.1 \ - jdk/src/bsd/doc/man/idlj.1 \ - jdk/src/bsd/doc/man/jar.1 \ - jdk/src/bsd/doc/man/jarsigner.1 \ - jdk/src/bsd/doc/man/java.1 \ - jdk/src/bsd/doc/man/javac.1 \ - jdk/src/bsd/doc/man/javadoc.1 \ - jdk/src/bsd/doc/man/javah.1 \ - jdk/src/bsd/doc/man/javap.1 \ - jdk/src/bsd/doc/man/jcmd.1 \ - jdk/src/bsd/doc/man/jconsole.1 \ - jdk/src/bsd/doc/man/jdb.1 \ - jdk/src/bsd/doc/man/jdeps.1 \ - jdk/src/bsd/doc/man/jhat.1 \ - jdk/src/bsd/doc/man/jinfo.1 \ - jdk/src/bsd/doc/man/jjs.1 \ - jdk/src/bsd/doc/man/jmap.1 \ - jdk/src/bsd/doc/man/jps.1 \ - jdk/src/bsd/doc/man/jrunscript.1 \ - jdk/src/bsd/doc/man/jsadebugd.1 \ - jdk/src/bsd/doc/man/jstack.1 \ - jdk/src/bsd/doc/man/jstat.1 \ - jdk/src/bsd/doc/man/jstatd.1 \ - jdk/src/bsd/doc/man/keytool.1 \ - jdk/src/bsd/doc/man/native2ascii.1 \ - jdk/src/bsd/doc/man/orbd.1 \ - jdk/src/bsd/doc/man/pack200.1 \ - jdk/src/bsd/doc/man/policytool.1 \ - jdk/src/bsd/doc/man/rmic.1 \ - jdk/src/bsd/doc/man/rmid.1 \ - jdk/src/bsd/doc/man/rmiregistry.1 \ - jdk/src/bsd/doc/man/schemagen.1 \ - jdk/src/bsd/doc/man/serialver.1 \ - jdk/src/bsd/doc/man/servertool.1 \ - jdk/src/bsd/doc/man/tnameserv.1 \ - jdk/src/bsd/doc/man/unpack200.1 \ - jdk/src/bsd/doc/man/wsgen.1 \ - jdk/src/bsd/doc/man/wsimport.1 \ - jdk/src/bsd/doc/man/xjc.1 \ - jdk/src/linux/doc/man/appletviewer.1 \ - jdk/src/linux/doc/man/extcheck.1 \ - jdk/src/linux/doc/man/idlj.1 \ - jdk/src/linux/doc/man/jar.1 \ - jdk/src/linux/doc/man/jarsigner.1 \ - jdk/src/linux/doc/man/java.1 \ - jdk/src/linux/doc/man/javac.1 \ - jdk/src/linux/doc/man/javadoc.1 \ - jdk/src/linux/doc/man/javah.1 \ - jdk/src/linux/doc/man/javap.1 \ - jdk/src/linux/doc/man/jcmd.1 \ - jdk/src/linux/doc/man/jconsole.1 \ - jdk/src/linux/doc/man/jdb.1 \ - jdk/src/linux/doc/man/jdeps.1 \ - jdk/src/linux/doc/man/jhat.1 \ - jdk/src/linux/doc/man/jinfo.1 \ - jdk/src/linux/doc/man/jjs.1 \ - jdk/src/linux/doc/man/jmap.1 \ - jdk/src/linux/doc/man/jps.1 \ - jdk/src/linux/doc/man/jrunscript.1 \ - jdk/src/linux/doc/man/jsadebugd.1 \ - jdk/src/linux/doc/man/jstack.1 \ - jdk/src/linux/doc/man/jstat.1 \ - jdk/src/linux/doc/man/jstatd.1 \ - jdk/src/linux/doc/man/keytool.1 \ - jdk/src/linux/doc/man/native2ascii.1 \ - jdk/src/linux/doc/man/orbd.1 \ - jdk/src/linux/doc/man/pack200.1 \ - jdk/src/linux/doc/man/policytool.1 \ - jdk/src/linux/doc/man/rmic.1 \ - jdk/src/linux/doc/man/rmid.1 \ - jdk/src/linux/doc/man/rmiregistry.1 \ - jdk/src/linux/doc/man/schemagen.1 \ - jdk/src/linux/doc/man/serialver.1 \ - jdk/src/linux/doc/man/servertool.1 \ - jdk/src/linux/doc/man/tnameserv.1 \ - jdk/src/linux/doc/man/unpack200.1 \ - jdk/src/linux/doc/man/wsgen.1 \ - jdk/src/linux/doc/man/wsimport.1 \ - jdk/src/linux/doc/man/xjc.1 \ - jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \ - jdk/src/solaris/doc/sun/man/man1/appletviewer.1 \ - jdk/src/solaris/doc/sun/man/man1/extcheck.1 \ - jdk/src/solaris/doc/sun/man/man1/idlj.1 \ - jdk/src/solaris/doc/sun/man/man1/jar.1 \ - jdk/src/solaris/doc/sun/man/man1/jarsigner.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/javadoc.1 \ - jdk/src/solaris/doc/sun/man/man1/javah.1 \ - jdk/src/solaris/doc/sun/man/man1/javap.1 \ - jdk/src/solaris/doc/sun/man/man1/jcmd.1 \ - jdk/src/solaris/doc/sun/man/man1/jconsole.1 \ - jdk/src/solaris/doc/sun/man/man1/jdb.1 \ - jdk/src/solaris/doc/sun/man/man1/jdeps.1 \ - jdk/src/solaris/doc/sun/man/man1/jhat.1 \ - jdk/src/solaris/doc/sun/man/man1/jinfo.1 \ - jdk/src/solaris/doc/sun/man/man1/jjs.1 \ - jdk/src/solaris/doc/sun/man/man1/jmap.1 \ - jdk/src/solaris/doc/sun/man/man1/jps.1 \ - jdk/src/solaris/doc/sun/man/man1/jrunscript.1 \ - jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 \ - jdk/src/solaris/doc/sun/man/man1/jstack.1 \ - jdk/src/solaris/doc/sun/man/man1/jstat.1 \ - jdk/src/solaris/doc/sun/man/man1/jstatd.1 \ - jdk/src/solaris/doc/sun/man/man1/keytool.1 \ - jdk/src/solaris/doc/sun/man/man1/native2ascii.1 \ - jdk/src/solaris/doc/sun/man/man1/orbd.1 \ - jdk/src/solaris/doc/sun/man/man1/pack200.1 \ - jdk/src/solaris/doc/sun/man/man1/policytool.1 \ - jdk/src/solaris/doc/sun/man/man1/rmic.1 \ - jdk/src/solaris/doc/sun/man/man1/rmid.1 \ - jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 \ - jdk/src/solaris/doc/sun/man/man1/schemagen.1 \ - jdk/src/solaris/doc/sun/man/man1/serialver.1 \ - jdk/src/solaris/doc/sun/man/man1/servertool.1 \ - jdk/src/solaris/doc/sun/man/man1/tnameserv.1 \ - jdk/src/solaris/doc/sun/man/man1/unpack200.1 \ - jdk/src/solaris/doc/sun/man/man1/wsgen.1 \ - jdk/src/solaris/doc/sun/man/man1/wsimport.1 \ - jdk/src/solaris/doc/sun/man/man1/xjc.1 \ - nashorn/test/script/jfx.js \ - nashorn/test/script/jfx/kaleidoscope.js \ - nashorn/test/script/jfx/spread.js SHEBANG_FILES= configure _MAKE_JOBS= # @@ -208,12 +50,11 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 202 -JDK_BUILD_NUMBER= 08 -DIST_BUILD_NUMBER= 132 +JDK_UPDATE_VERSION= 212 +JDK_BUILD_NUMBER= 04 +BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 -JTREG_JENKINS_BUILD= 77 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} @@ -378,16 +219,6 @@ ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif -post-extract: - @${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-extract-TEST-on: @${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/ @@ -396,9 +227,6 @@ do-patch-FONTCONFIG-on: 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 @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${FILESDIR}/bsd.fontconfig.properties.in > \ ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Modified: head/java/openjdk8/distinfo ============================================================================== --- head/java/openjdk8/distinfo Fri Apr 19 16:13:22 2019 (r499374) +++ head/java/openjdk8/distinfo Fri Apr 19 16:31:33 2019 (r499375) @@ -1,55 +1,5 @@ -TIMESTAMP = 1549756797 -SHA256 (openjdk-8-src-b132-03_mar_2014.zip) = ba651f9aa68fdc823b2ef55510710a013ab9f78fff291d5dc1c4d166f3e1e589 -SIZE (openjdk-8-src-b132-03_mar_2014.zip) = 124099402 +TIMESTAMP = 1555604894 +SHA256 (jdk8u212-b04.1.tar.gz) = b69b2601bd1ddb68700df801b0ad5c8351ca8c937573130603910614e7d478d6 +SIZE (jdk8u212-b04.1.tar.gz) = 85191465 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 -SHA256 (patch-8u05-b13.xz) = 0fd6dfa17769a92d94a710e330d411fcbd49a8142d4cb8826b96b42d3c007a63 -SIZE (patch-8u05-b13.xz) = 88636 -SHA256 (patch-8u11-b13.xz) = 68ead09e1841fc43a4fec2c386acc70e3edab99e116923befa0d83960c4a1f85 -SIZE (patch-8u11-b13.xz) = 48852 -SHA256 (patch-8u20-b26.xz) = 23c704ed10f0e081e956755e22049b3ef7897b3bc5a7a6450a4d1856351f55a8 -SIZE (patch-8u20-b26.xz) = 1898392 -SHA256 (patch-8u25-b17.xz) = beb9ef5ca12660da57f5a8409de4576aef4a55dd9de7bdc14a3d64f706cee6e8 -SIZE (patch-8u25-b17.xz) = 45968 -SHA256 (patch-8u31-b13.xz) = c77ca4137a95e45a377c31f2c7a2d0280b64f5d411089cda7380c04c7a70685a -SIZE (patch-8u31-b13.xz) = 204032 -SHA256 (patch-8u40-b25.xz) = 178fd0737235ebef61e39cc06e6d1fdd5079b727b0d23f9326cd39b97036c0d1 -SIZE (patch-8u40-b25.xz) = 1662812 -SHA256 (patch-8u45-b14.xz) = 4a2e7c5e3275db6a7aebe15c7dcc9abe9125b25e490c015367ca8ebcf8c65bac -SIZE (patch-8u45-b14.xz) = 285564 -SHA256 (patch-8u51-b16.xz) = 146e8ffa75911a2bc53099ea07625db259f88cbac2e678f965f55c483a01050f -SIZE (patch-8u51-b16.xz) = 71144 -SHA256 (patch-8u60-b23.xz) = 8ebe80e8add9e61dcb43e9be756ccc6d566a39748e7726f265df73af2d082798 -SIZE (patch-8u60-b23.xz) = 1043720 -SHA256 (patch-8u66-b17-1.xz) = 8d11cf62d9b70857d1008dea0cdcf9d5b4ba30320696cb2568a8bc13f202bb2e -SIZE (patch-8u66-b17-1.xz) = 351328 -SHA256 (patch-8u72-b15.xz) = 42f774b72f3dbdbfadc63d0b8fb7d94c51c3062d80aedec86f59d295823136d1 -SIZE (patch-8u72-b15.xz) = 282984 -SHA256 (patch-8u74-b02.xz) = c21a08d00d8417369837fe82d68bb4f30bcf8c1c93aef85581761e328c58fccd -SIZE (patch-8u74-b02.xz) = 2056 -SHA256 (patch-8u77-b03.xz) = d6469852d556ff9e379852e5a64cc104faf0545804c7f18f65b9840a8cb3a1c1 -SIZE (patch-8u77-b03.xz) = 4404 -SHA256 (patch-8u92-b14.xz) = c3c8e607048c61c8b425849c6bb73add59ba9887e4a9d4f6147ab51ad11c8d17 -SIZE (patch-8u92-b14.xz) = 172836 -SHA256 (patch-8u102-b14.xz) = 02ae897c1bfbb137339fe00f0672af268b94beee88f44c818a6060dc207d72c3 -SIZE (patch-8u102-b14.xz) = 411024 -SHA256 (patch-8u112-b16.xz) = adbca9b317d599a3ee2e8ac6efb47b0576bdb1ebf0a8b9a0d0d7742db499b921 -SIZE (patch-8u112-b16.xz) = 217492 -SHA256 (patch-8u121-b13.xz) = ef48cad21bb0ccadb3968147ab4d4d0b9ae024bf42a0fccf5714584f43df9ed4 -SIZE (patch-8u121-b13.xz) = 135520 -SHA256 (patch-8u131-b11.xz) = c0953d79f7e1b02ed75e6757ff170a144527af9b44f44cb36f2ddb484437d4d6 -SIZE (patch-8u131-b11.xz) = 88068 -SHA256 (patch-8u144-b01.xz) = 4b4b73a345bc69085b712213ff55831e739cf43c9d0b87e77da91283e7c3520f -SIZE (patch-8u144-b01.xz) = 239460 -SHA256 (patch-8u152-b16.xz) = 51c57b8d60b8f71758fe03c45c70ab60d0423bf4699e71b21ba4148f80497852 -SIZE (patch-8u152-b16.xz) = 454236 -SHA256 (patch-8u162-b12.xz) = 9f083cde406ead14e38f5423a6dcc0f0b0a3f7ef69fdc4c83a32b8fea4c3ddcb -SIZE (patch-8u162-b12.xz) = 337248 -SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b882d78c7c559934 -SIZE (patch-8u172-b11.xz) = 146716 -SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839 -SIZE (patch-8u181-b13.xz) = 69096 -SHA256 (patch-8u192-b26.xz) = 5bfa782ec2af8ddc6aed3e8de81cc37c7f375ebad650341d1ce74956c82a411e -SIZE (patch-8u192-b26.xz) = 284164 -SHA256 (patch-8u202-b08.xz) = 16195793d00b1fbe18e4d3a4cab2db1e5a28722e43d3466d03283ab01d9524d0 -SIZE (patch-8u202-b08.xz) = 202660 Modified: head/java/openjdk8/files/cacerts ============================================================================== Binary file (source and/or target). No diff available. Modified: head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk ============================================================================== --- head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Fri Apr 19 16:13:22 2019 (r499374) +++ head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Fri Apr 19 16:31:33 2019 (r499375) @@ -1,23 +1,20 @@ ---- jdk/make/lib/Awt2dLibraries.gmk.orig 2018-12-02 16:06:28.335527000 -0800 -+++ jdk/make/lib/Awt2dLibraries.gmk 2018-12-02 16:29:22.253979000 -0800 -@@ -1236,6 +1236,11 @@ - LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 - LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 - -+ else ifeq ($(OPENJDK_TARGET_OS), bsd) -+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include -+ ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) +--- jdk/make/lib/Awt2dLibraries.gmk.orig 2019-04-17 23:24:06.000000000 -0700 ++++ jdk/make/lib/Awt2dLibraries.gmk 2019-04-18 11:22:47.195832000 -0700 +@@ -1190,7 +1190,7 @@ + else ifeq ($(OPENJDK_TARGET_OS), bsd) + LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include + ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) +- LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG + LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%% -+ endif + endif else ifeq ($(OPENJDK_TARGET_OS), windows) LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 - else -@@ -1257,6 +1262,8 @@ +@@ -1212,7 +1212,7 @@ + -framework Cocoa \ -framework JavaNativeFoundation + 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 else ifeq ($(OPENJDK_TARGET_OS), windows) LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll -+ else ifeq ($(OPENJDK_TARGET_OS), bsd) -+ 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 - endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904191631.x3JGVYI2000355>