git: 0cfcfca4378d - main - devel/R-cran-rJava: fix build on powerpc

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Fri, 17 Jan 2025 21:47:23 UTC

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cfcfca4378dc0864dacb9d826a8bfb84cbef70a

commit 0cfcfca4378dc0864dacb9d826a8bfb84cbef70a
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2025-01-16 18:56:30 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2025-01-17 21:45:49 +0000

    devel/R-cran-rJava: fix build on powerpc
    
    Use correct jdk directory.
---
 devel/R-cran-rJava/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile
index c96c1f480486..92bb495f47e3 100644
--- a/devel/R-cran-rJava/Makefile
+++ b/devel/R-cran-rJava/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libicuuc.so:devel/icu	\
 
 USES=		cran:compiles java
 
-JRE_LIBS=	${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc64/ppc64/}/server	# JDK8
+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} "
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}	\