From nobody Mon May 6 20:18:47 2024 X-Original-To: dev-commits-ports-all@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 4VYCRD4PKwz5JFLq; Mon, 06 May 2024 20:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VYCRD09mhz4CrQ; Mon, 6 May 2024 20:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715026728; 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=eFySJNz/QXR8X3mvFb0JbF4xpNUVwUupDmGfshMxXsY=; b=NuJ+ZnpfAhW2kaEF95m6ZGxUjelRNNGlQ0bt7HtlBJDN9gBWdTiFDMdIx11WuBbMZcAMN8 aUiKIKwiLXMqQKK8HiNSUJK49jnx3/67Az/mOPHe9U6XIoTXbjPa1gdTvT/oS/Wta4RBXa BCjFQ1zziPk9zewFQt9AdqQ+6bubyptddgp4FUZGUcS+siPgTc+RxsOC/vUCFcN5o3k0q+ cKxt9wnM0SifH9p6fgIL0V/MomQJ02MjdqAyrjMBot4+c7zbuLaq2WyUnyu7qn+9ZycDmY nKDuTbb4ZfgjWdc4matgWpuNJGZcD+RN10xPXAQZYi5lW0s2Bv9DQ5W1NSkhwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715026728; a=rsa-sha256; cv=none; b=pxLxtUp9FBxzlDPPIGROXGYhJy1cGhnSqnIQ8B/zPHc9ZXlF6PaO+OzLRLheH59Qr1XWQF DepNMGnrzn1UeUL52k9t6k4L+ivkX07M8g2/Wl9JvkScFDcJC70cYirEQic5rvYV/pgH61 S6QRcFbykrlBpTpFrgHLKztZYxlou1Q83NKIcwjolA/N06FycHJ7GuqDrigjjkEUsl75sh jT+cC7Lrwg0O7QVvfrW0kvNTWGbEJwSzqujUTyGxD322pXpoanIcgLSeuioU/+sKda05BV aYu6owaBspcTnbaVJfFbUXB4or1EyJzSDhq3IJWSy261UtXXqBfCheCTm3Fjvw== 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=1715026728; 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=eFySJNz/QXR8X3mvFb0JbF4xpNUVwUupDmGfshMxXsY=; b=issrUJ5oHcepWPAjWwijaW+bkDVY9EsskrnWaieyKJc4JeTgYU8RyYhpV/gyrz883Vj42+ VDgtRUuEZiyD8LyySxsHOw2bi5h5rN0ZjgFn1Vti7GqiIXjWMeWjY9g0oR6sWteX9FH/VJ yAFfE1wMe+21LOI6XViD3QayoWKGXv4+amU1cjbMLpQ2JN8ix+ZYRzsyeiwf3ZTh61nhAU TJVPgJMv+Ji8qM2RUxBg3ta0/z8npSRZnYbWcW14xxThWoVIgCqxBJaZ3JZ4+GqlTAWCHv PjGdPSA5BJaK3peaROmIfPASD0VpbmwMVuXBQxh04LLYIv5JSze7+fXGFAtD9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VYCRC6w7Mz19yx; Mon, 6 May 2024 20:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 446KIlNT031987; Mon, 6 May 2024 20:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 446KIl5g031984; Mon, 6 May 2024 20:18:47 GMT (envelope-from git) Date: Mon, 6 May 2024 20:18:47 GMT Message-Id: <202405062018.446KIl5g031984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 2a7abdbccbf9 - 2024Q2 - sysutils/slurm-wlm: add correct linker emulation for aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 2a7abdbccbf9460e6c411c1d67fec4b0e373e8c4 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a7abdbccbf9460e6c411c1d67fec4b0e373e8c4 commit 2a7abdbccbf9460e6c411c1d67fec4b0e373e8c4 Author: Robert Clausecker AuthorDate: 2024-05-05 17:20:52 +0000 Commit: Robert Clausecker 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@|'