From nobody Wed Apr 24 21:21:50 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 4VPsPW0ZY2z5J7MK; Wed, 24 Apr 2024 21:21:51 +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 4VPsPV5fgwz4RNq; Wed, 24 Apr 2024 21:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713993710; 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=rbzWkL59Pb6G+L+yNQ3mGfkj/8taSZAbh4bExdI658Y=; b=ws5omtBzLqqygMLdhMdOD1fYmJMTjEBGRY/bckaZtBB70t1tgm4cLvzIZ+LUnM1jg72Qox LZCl+9OE4cah1Q8ej+X8ZxZmtkFotQj2OJC2c00153Z64p2eHsYLCJ86Kl2vyowsVHH/WM 3chC7Gcn8DbJyyZ+EQDCrkEsLVkCCS7lZe3C8q+MojkpzyrWdWD6OTZpTKuO3SimCKb1no 5/ChM7xJb7YGW2PYzVTqTnDFlmJ/O+Q1gt+PnMx6mGrLvmxPGXfU4ZOSq6PbKreV0pbOhd clXdx8h+uhcy7LU5aVs1k3hvH3yJYBv8Ccu96Ve/r0Ar8ZCAiYuSxtpaMjTHGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713993710; a=rsa-sha256; cv=none; b=IG+TyrHpZbaE+Zq4q00CMtAfYdq3T366E2ch+xK+PDPSbNQ0MNh9CjGNePyCuG9Q7rsu7q s2TluSWofiuhyATaTzWDhnmlYvsJVww8qHGEVIBe6sTlijKtW+i9iQbGqJJbeT1ujyfRMn uXispXyYi99Ik040wQ4qiH5a2wb3yNuKqS+lVUWH2/5HguAaBNbeOZZO7usTYFU4NLq177 AW9ghXekNP8lQ8s+171zKjzHO/Q9Z5m7TB7uOtQ3DSRRVXR+C4EnpJQWBvuPFQcDMEcyQF s2I/Y0N2uaJKY9eOnD5j6YUsVVcYOR5Fq4r+lBRXHSqNGNsQXVmHuOTPObNFGA== 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=1713993710; 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=rbzWkL59Pb6G+L+yNQ3mGfkj/8taSZAbh4bExdI658Y=; b=Q79MV9vXziD5L9SPL3ix3VRtio3HP9NmlinopS0KF9QMNcijniUePA+KI5/nChDCk2c+Gd 91kcfdJ38gf1dAJuw6wICPRXu8Erx0rzrWDo+Uzr+XenjXc4QumCZ3b7VHxfNMEZdFKaGh 3zXb5/e+Lom2bQ8cY3GltedZX1idzieeFIRaoGRc10IFBmLYJU76Rs/HiFFl2yN6LchL68 WdjGDBUT61/MfjZyqFzSoHk/fsB8vYXpAEvNPRZ2QuPtZvKxr0vgVFRFmAEXKx0fe6SdTf NYLxISiiIjWPTZFS30NDs7Y7tMdzakgw819GrzWmGQ3nCqoPJIb+HEr1AT2/zw== 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 4VPsPV5DQdzXKL; Wed, 24 Apr 2024 21:21:50 +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 43OLLokf082092; Wed, 24 Apr 2024 21:21:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLLoOM082089; Wed, 24 Apr 2024 21:21:50 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:21:50 GMT Message-Id: <202404242121.43OLLoOM082089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: b1e6d53ca84c - main - sysutils/slurm-wlm: fix build on powerpc64* 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1e6d53ca84c39a466d21c43bb7ac503bd9635e5 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1e6d53ca84c39a466d21c43bb7ac503bd9635e5 commit b1e6d53ca84c39a466d21c43bb7ac503bd9635e5 Author: Piotr Kubaj AuthorDate: 2024-04-24 09:00:59 +0000 Commit: Piotr Kubaj CommitDate: 2024-04-24 21:21:18 +0000 sysutils/slurm-wlm: fix build on powerpc64* While here, also enable ofed libraries which don't seem to be experimental anymore. --- sysutils/slurm-wlm/Makefile | 13 +++++++++++-- sysutils/slurm-wlm/pkg-plist | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 0994b4f72631..ee3014a9f019 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -85,8 +85,7 @@ RRD_CONFIGURE_WITH= rrdtool # FreeBSD Infiniband support is still experimental # slurmrestd does not build on FreeBSD -CONFIGURE_ARGS= --without-ofed --disable-slurmrestd \ - --with-mysql_config=${LOCALBASE}/bin \ +CONFIGURE_ARGS= --disable-slurmrestd --with-mysql_config=${LOCALBASE}/bin \ --docdir=${DOCSDIR} --htmldir=${DOCSDIR} CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include \ @@ -119,6 +118,8 @@ PROC2FIX= common/callerid.c common/fd.c common/fetch_config.c \ LLD2FIX= api plugins/openapi sacctmgr sackd scontrol scrontab scrun \ slurmctld slurmd/slurmd squeue +.include + # Hack around nonfunctional --disable-gtktest flag pre-configure-GUI-off: ${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \ @@ -143,8 +144,16 @@ 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|' +.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@|' diff --git a/sysutils/slurm-wlm/pkg-plist b/sysutils/slurm-wlm/pkg-plist index 1104c8d36b51..302cc5903f07 100644 --- a/sysutils/slurm-wlm/pkg-plist +++ b/sysutils/slurm-wlm/pkg-plist @@ -48,6 +48,8 @@ lib/slurm/acct_gather_energy_rapl.so %%IPMI%%lib/slurm/acct_gather_energy_xcc.so lib/slurm/acct_gather_filesystem_lustre.a lib/slurm/acct_gather_filesystem_lustre.so +lib/slurm/acct_gather_interconnect_ofed.a +lib/slurm/acct_gather_interconnect_ofed.so lib/slurm/acct_gather_interconnect_sysfs.a lib/slurm/acct_gather_interconnect_sysfs.so %%CURL%%lib/slurm/acct_gather_profile_influxdb.a