Bug 282987 - devel/R-cran-rJava: fix build on armv7
Summary: devel/R-cran-rJava: fix build on armv7
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: arm Any
: --- Affects Only Me
Assignee: Ronald Klop
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-11-26 16:25 UTC by Ronald Klop
Modified: 2024-11-26 18:24 UTC (History)
0 users

See Also:
thierry: maintainer-feedback+


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ronald Klop freebsd_committer freebsd_triage 2024-11-26 16:25:44 UTC
This patch fixes the build on armv7 (and presumably on armv6).

Any objections for me to commit this?

diff --git a/devel/R-cran-rJava/Makefile b/devel/R-cran-rJava/Makefile
index d20db705e70e..4dc72caf7725 100644
--- a/devel/R-cran-rJava/Makefile
+++ b/devel/R-cran-rJava/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=  libicuuc.so:devel/icu   \
 USES=          cran:compiles
 USE_JAVA=      yes
 
-JRE_LIBS=      ${JAVA_HOME}/jre/lib/${ARCH:S/powerpc64/ppc64/}/server  # JDK8
+JRE_LIBS=      ${JAVA_HOME}/jre/lib/${ARCH:S/armv6/arm/:S/armv7/arm/:S/powerpc64/ppc64/}/server        # JDK8
 #JRE_LIBS=     ${JAVA_HOME}/jre/lib/server     # JDK11
 LDFLAGS=       "-Wl,-rpath=${JRE_LIBS} "
 MAKE_ENV=      JAVA_HOME=${JAVA_HOME}  \


I tested it in an armv7 jail on aarch64/RPI4.
Comment 1 Thierry Thomas freebsd_committer freebsd_triage 2024-11-26 18:12:16 UTC
Approved, thanks!
Comment 2 commit-hook freebsd_committer freebsd_triage 2024-11-26 18:23:36 UTC
A commit in branch main references this bug:

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

commit f22ce99cb51b14252197ba1db00a8f348abea625
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2024-11-26 18:21:06 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2024-11-26 18:22:31 +0000

    devel/R-cran-rJava: enable armv7

    PR:     282987
    Approved by:    thierry@ (maintainer)

 devel/R-cran-rJava/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 3 Ronald Klop freebsd_committer freebsd_triage 2024-11-26 18:24:52 UTC
Thanks for the quick response!