summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Klop <ronald@FreeBSD.org>2025-09-14 11:31:47 +0200
committerRonald Klop <ronald@FreeBSD.org>2025-09-14 11:36:53 +0200
commitf3020798cf97b07671462ff28909defaad6af5aa (patch)
treed33770f7492e3671e654af2c136be13c3f912b31
parentwww/redmine60: chase recent rubygems updates. (diff)
java/openjdk17: fix build without MAKE_JOBS_UNSAFE
Put back _MAKE_JOBS with a description why it is set empty. Fixes: ===> Building for openjdk17-17.0.16+8.1_2 Error: 'make -jN' is not supported, use 'make JOBS=N' NB: this error came from work/jdk17u-jdk-17.0.16-8-1/make/InitSupport.gmk:119 Bump portrevision so future failures are easy to trace back to specific port version. Reported-by: https://lists.freebsd.org/archives/freebsd-ports/2025-September/008453.html
-rw-r--r--java/openjdk17/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index 8e4fb466e6f0..1af63a2554c8 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -1,7 +1,7 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
@@ -39,6 +39,9 @@ GH_PROJECT= jdk17u
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-jobs=N
+_MAKE_JOBS=
MAKE_ENV= LANG="C" \
LC_ALL="C" \
CLASSPATH="" \
@@ -88,6 +91,7 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
--with-giflib-include=${LOCALBASE}/include \
--with-giflib-lib=${LOCALBASE}/lib \
--with-harfbuzz=system \
+ --with-jobs=${MAKE_JOBS_NUMBER} \
--with-libpng=system \
--with-zlib=system \
--with-lcms=system \
@@ -101,12 +105,6 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
--with-vendor-bug-url="${JDK_BUG_URL}" \
--with-vendor-vm-bug-url="${JDK_BUG_URL}"
-.if defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+= --with-jobs=1
-.elif defined(MAKE_JOBS_NUMBER)
-CONFIGURE_ARGS+= --with-jobs=${MAKE_JOBS_NUMBER}
-.endif
-
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
.if defined(BUILD_JRE)