From nobody Tue Mar 24 13:44:48 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fgB9X27kCz6Whxb for ; Tue, 24 Mar 2026 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fgB9X1S0Rz3QwF for ; Tue, 24 Mar 2026 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774359888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVJTa8mcsfEJf2C6U9kTxpRxaPmbhgLMEv7QiB5TJFw=; b=uPJ5q7sQ/N6mzOC5qPLOi6PSUBzzCFKRmT1WNSo3tSFYBi6FP1bbK5o9LdLBxAuMIIalNB 1RLtqaZnRs/yiJw1qjce2Tcfqaonxvt3N/oJ+nm29dAGMD4GcfTVgE+rZHIWhp1BljbMHe b1sq7/m4EcbbAg009G9jZJuUKFwGSh2fU9hPm26rN9RJPqHG5wvruB4XbHICzup1ZUZwKU /PFHtn/oX3kk7h5bSAugXTNand2hC0iS+k8hqNKU5kljDJ44Box8lCLMS1PgTLaPlB+H/t LzcuamTi0QRp/DIwtoXmEl5CTJGMvMZFwC8gjtQ84VnHOmpYJaAxF6qRujEJ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774359888; a=rsa-sha256; cv=none; b=mcAdbR9JEnbYqVvr1NiDLfgNXqBEkenIEcJ0VcHRz28sZlKeeLh+ujblF5JOPT6yqo0lrR 6/Ah3jG9RPigzIgYrmRUaYuUgP+tp0XPg1v8cETeiD/1+LyAsGbjBso0YZnV3iEGAeOMGi PBatzQkakvSunglp1Dl+iKpEhUdpQmfdtJKwGPCxjXL0aM04PUUHod+2BgEVxrf/ppPQZm O5V1At1uswJtoIXOOa3lhBjwBTS3S0m/sDGVVOiaU7pSkUG/3DuXy4iWThCsYMfC3e6jeN FtMN5tBSsoVUIdyTZ0R11mIBobjAeeiWbRXaQB/Wu1tMzq27AyurdaA6Xn+ifg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774359888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVJTa8mcsfEJf2C6U9kTxpRxaPmbhgLMEv7QiB5TJFw=; b=o8e6WBi2Cz/tawDJ45jIUkQOBB5tgw0kD2ko7hqKbxLcEQSjCvb8o0ECVPRZ1jHxR5ysTR PtEYmP5ubImN9TjZTNs/QDziQJSTKpzDnhdIZ0mEy4Y9EvvztvJbBZv2gv6l0yCbAmrEzF nYWiFnhxslZdSItppcxGV+vl7eMRGDZ8w9iwgs1a/aLoIYAc5QfPT0lyOylm1Sr9dp6Jwy mCwtD5vKnvyvlxOwaOwUSYUfS3q/YG+gAXDV1Qq6L3sIfMfL7VDXCUpqO09FCoQJBqd6LI fbFy+xHHZm4WSMOYSQxKge+OXaus4ZEjqY4TprsIcUnrFLiwr+O1eZNzChG6Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgB9X0n31z5nP for ; Tue, 24 Mar 2026 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4718b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 13:44:48 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: cda35b358121 - main - devel/R-cran-rJava: switch to JDK21 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cda35b358121fd31080601123eb0e772a9b1223d Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 13:44:48 +0000 Message-Id: <69c29550.4718b.7aa892e2@gitrepo.freebsd.org> The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=cda35b358121fd31080601123eb0e772a9b1223d commit cda35b358121fd31080601123eb0e772a9b1223d Author: Thierry Thomas AuthorDate: 2026-03-24 13:43:04 +0000 Commit: Thierry Thomas CommitDate: 2026-03-24 13:44:41 +0000 devel/R-cran-rJava: switch to JDK21 --- devel/R-cran-rJava/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile index 5c436f266cec..e759c15af14a 100644 --- a/devel/R-cran-rJava/Makefile +++ b/devel/R-cran-rJava/Makefile @@ -1,5 +1,6 @@ PORTNAME= rJava DISTVERSION= 1.0-15 +PORTREVISION= 1 CATEGORIES= devel java DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -16,20 +17,22 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ USES= cran:compiles java # On JDK11+: checking whether JNI programs can be compiled... configure: error: Cannot compile a simple JNI program. See config.log for details. -JAVA_VERSION= 8 +#JAVA_VERSION= 8 -JRE_LIBS= ${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc/ppc/}/server # JDK8 -#JRE_LIBS= ${JAVA_HOME}/jre/lib/server # JDK11 -LDFLAGS= "-Wl,-rpath=${JRE_LIBS} " +#JRE_LIBS= ${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc/ppc/}/server # JDK8 +JRE_LIBS= ${JAVA_HOME}/lib/server # JDK21 +CPPFLAGS+= -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OPSYS:tl} +LDFLAGS+= "-Wl,-rpath=${JRE_LIBS} " MAKE_ENV+= JAVA_HOME=${JAVA_HOME} \ JAVA=${JAVA} \ JAVAC=${JAVA_HOME}/bin/javac \ JAVAH=${JAVAH} \ JAR=${JAR} \ + LDFLAGS="${LDFLAGS}" \ LD_LIBRARY_PATH="${JRE_LIBS}" \ JAVA_LD_LIBRARY_PATH="${JRE_LIBS}" \ JAVA_LIBS="-Wl,-rpath=${JRE_LIBS} -L${JRE_LIBS} -ljvm -lpthread" \ - JAVA_CPPFLAGS="-I${JAVA_HOME}/jre/../include -I${JAVA_HOME}/jre/../include/${OPSYS:tl}" \ + JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:tl}" \ ${TEST_ENV} # Mk/Uses/cran.mk does not use TEST_ENV for test but MAKE_ENV TEST_ENV= DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}