Date: Wed, 24 Apr 2024 21:21:50 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b1e6d53ca84c - main - sysutils/slurm-wlm: fix build on powerpc64* Message-ID: <202404242121.43OLLoOM082089@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1e6d53ca84c39a466d21c43bb7ac503bd9635e5 commit b1e6d53ca84c39a466d21c43bb7ac503bd9635e5 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2024-04-24 09:00:59 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> 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 <bsd.port.options.mk> + # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404242121.43OLLoOM082089>