diff options
Diffstat (limited to 'java/openjdk11')
| -rw-r--r-- | java/openjdk11/Makefile | 38 | ||||
| -rw-r--r-- | java/openjdk11/distinfo | 18 | ||||
| -rw-r--r-- | java/openjdk11/pkg-message | 6 |
3 files changed, 36 insertions, 26 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 25c3ae414590..df374344d96d 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -3,6 +3,8 @@ DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} +MASTER_SITES= LOCAL/openjdk/:boot +DISTFILES= ${BOOTSTRAPJDKFILE}:boot PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -39,6 +41,8 @@ GH_PROJECT= jdk11u NO_CCACHE= yes +# Suppress passing -j to do-build target via Mk/bsd.port.mk +# In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N _MAKE_JOBS= # MAKE_ENV= LANG="C" \ LC_ALL="C" \ @@ -48,9 +52,12 @@ MAKE_ENV= LANG="C" \ CC=${CC} \ CXX=${CXX} \ CPP=${CPP} \ + LOG=cmdlines \ MAKEFLAGS="" -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/} +JDK_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/} +BOOTSTRAPJDKFILE= openjdk11-11.0.29+7.1.${JDK_ARCH}.tar.xz +JDK_OSARCH= bsd-${JDK_ARCH} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} .if defined(BUILD_JRE) JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre @@ -58,13 +65,14 @@ JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk .endif INSTALLDIR= ${PREFIX}/${PKGBASE} +BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 27 -JDK_BUILD_NUMBER= 6 +JDK_PATCH_VERSION= 30 +JDK_BUILD_NUMBER= 7 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 @@ -101,6 +109,7 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-libpng=system \ + --with-num-cores=${MAKE_JOBS_NUMBER} \ --with-zlib=system \ --with-lcms=system \ --x-includes=${LOCALBASE}/include \ @@ -124,24 +133,13 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> -.if !${PORT_OPTIONS:MCUPS} -MASTER_SITES+= https://codeload.github.com/OpenPrinting/cups/tar.gz/v${CUPS_INC_VER}?dummy=/:cups +# portsfallout.com shows flapping builds on 13.5 and 14.2 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1403000 +MAKE_JOBS_UNSAFE= yes .endif -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ - ${LOCALBASE}/bootstrap-openjdk11 - -# do we have valid native jdk installed? -.for BJDK in ${BOOTSTRAP_JDKS} -. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) -BOOTSTRAPJDKDIR= ${BJDK} -. endif -.endfor - -# if no valid jdk found, set dependency -.if !defined(BOOTSTRAPJDKDIR) -BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 +.if !${PORT_OPTIONS:MCUPS} +MASTER_SITES+= https://codeload.github.com/OpenPrinting/cups/tar.gz/v${CUPS_INC_VER}?dummy=/:cups .endif .if ${ARCH} == powerpc @@ -162,6 +160,8 @@ CFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} CXXFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} CONFIGURE_ARGS+=--disable-precompiled-headers .else +# it is up to upstream project to fix these or not +CFLAGS+= -Wno-deprecated-builtins -Wno-inline-asm -Wno-unknown-attributes MAKE_ENV+= USE_CLANG=true .if ${ARCH:Mpowerpc64*} LLVM_VER= 12 diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index b91fc199405c..65a6f36554c6 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,5 +1,17 @@ -TIMESTAMP = 1745123589 +TIMESTAMP = 1766160087 SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682 SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207 -SHA256 (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 64afcb0ad19c6a03591757d906355d0f263f8a529dea5654ba518e9399f13b1f -SIZE (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 116708083 +SHA256 (openjdk11-11.0.29+7.1.aarch64.tar.xz) = df27efa3322ca41c141a0c187d2ecf14f7c6771ae0f71e2afd95c6a6e223a55e +SIZE (openjdk11-11.0.29+7.1.aarch64.tar.xz) = 165129192 +SHA256 (openjdk11-11.0.29+7.1.ppc.tar.xz) = 9ded362b39d83fb32b3a77c44ccbfdaa2d2eca8238c9e9242c8f8c87859474dc +SIZE (openjdk11-11.0.29+7.1.ppc.tar.xz) = 142771612 +SHA256 (openjdk11-11.0.29+7.1.ppc64.tar.xz) = 775f34a13fbb1b15f44d44cea14f9abc968a3f396d79861d16470077c43ccf08 +SIZE (openjdk11-11.0.29+7.1.ppc64.tar.xz) = 152254408 +SHA256 (openjdk11-11.0.29+7.1.ppc64le.tar.xz) = b4cb2cf067d42be62c90a47ee7e39ec91a20f25cd5d1eaa24d8ee6ad6aed4d9d +SIZE (openjdk11-11.0.29+7.1.ppc64le.tar.xz) = 152360424 +SHA256 (openjdk11-11.0.29+7.1.x86.tar.xz) = 1a0778af2a89fc3a00a67b0d0144f97d8b59cae5730901da475fef45e492014d +SIZE (openjdk11-11.0.29+7.1.x86.tar.xz) = 152081036 +SHA256 (openjdk11-11.0.29+7.1.x86_64.tar.xz) = 59abad77c35f271dc6f2082e6f666028ac4b013e80ec1e9d16efb8d291859c62 +SIZE (openjdk11-11.0.29+7.1.x86_64.tar.xz) = 167421264 +SHA256 (battleblow-jdk11u-jdk-11.0.30+7-1_GH0.tar.gz) = 5c9623b9008983f0747802e358e0022c5497d1c8737f064a346a9211b2d38124 +SIZE (battleblow-jdk11u-jdk-11.0.30+7-1_GH0.tar.gz) = 116813062 diff --git a/java/openjdk11/pkg-message b/java/openjdk11/pkg-message index fcb6defe8dcd..811dcb1e3b58 100644 --- a/java/openjdk11/pkg-message +++ b/java/openjdk11/pkg-message @@ -1,17 +1,15 @@ [ { type: install message: <<EOM -This OpenJDK implementation may require fdescfs(5) mounted on /dev/fd -and procfs(5) mounted on /proc for some applications. +This OpenJDK implementation may require procfs(5) mounted on /proc for some +applications. If you have not done it yet, please do the following: - mount -t fdescfs fdesc /dev/fd mount -t procfs proc /proc To make it permanent, you need the following lines in /etc/fstab: - fdesc /dev/fd fdescfs rw 0 0 proc /proc procfs rw 0 0 EOM } |