Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 May 2024 20:18:47 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 2a7abdbccbf9 - 2024Q2 - sysutils/slurm-wlm: add correct linker emulation for aarch64
Message-ID:  <202405062018.446KIl5g031984@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q2 has been updated by fuz:

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

commit 2a7abdbccbf9460e6c411c1d67fec4b0e373e8c4
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-05-05 17:20:52 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-05-06 20:18:29 +0000

    sysutils/slurm-wlm: add correct linker emulation for aarch64
    
    Approved by:    portmgr (blanket)
    MFH:            2024Q2
    
    (cherry picked from commit 04a50fdffdfcf12183556b691aa138ef7a173d59)
---
 sysutils/slurm-wlm/Makefile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index 625cc74f5b99..41dcb2267d65 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -143,8 +143,19 @@ pre-configure:
 		${ECHO_CMD} "********************************************"; \
 		false; \
 	fi
+.if ${ARCH} == powerpc64le
+	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|-r -o|-r -m elf64lppc -o|'
+.elif ${ARCH} == powerpc64
+	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|-r -o|-r -m elf64ppc -o|'
+.elif ${ARCH} == aarch64
+	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|-r -o|-r -m aarch64elf -o|'
+.else
 	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|-r -o|-r -m elf_${ARCH} -o|'
+.endif
 	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|htmldir = \$${datadir.*$$|htmldir = @htmldir@|'
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405062018.446KIl5g031984>