Date: Sat, 22 Nov 2025 18:55:53 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Generic Rikka <rikka.goering@outlook.de> Subject: git: 1536bac0dd26 - main - sysutils/slurm-wlm: Update 23.11.7 => 25.11.0 Message-ID: <69220739.f674.6cbc4a65@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1536bac0dd26d81e315652929b8bfaff9c136089 commit 1536bac0dd26d81e315652929b8bfaff9c136089 Author: Generic Rikka <rikka.goering@outlook.de> AuthorDate: 2025-11-22 16:12:47 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-11-22 18:52:26 +0000 sysutils/slurm-wlm: Update 23.11.7 => 25.11.0 Changelogs: https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-23.11.md https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-24.05.md https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-24.11.md https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-25.05.md https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-25.11.md PR: 289656 289141 289394 --- sysutils/slurm-wlm/Makefile | 177 ++++++--------- sysutils/slurm-wlm/distinfo | 6 +- sysutils/slurm-wlm/files/patch-configure | 251 --------------------- .../slurm-wlm/files/patch-etc_slurm.conf.example | 116 ---------- .../slurm-wlm/files/patch-src_common_callerid.h | 10 - sysutils/slurm-wlm/files/patch-src_common_conmgr.c | 49 ---- sysutils/slurm-wlm/files/patch-src_common_net.c | 68 ------ .../slurm-wlm/files/patch-src_common_sack__api.c | 28 --- .../patch-src_common_slurm__protocol__socket.c | 98 -------- .../slurm-wlm/files/patch-src_common_stepd__api.c | 36 --- .../slurm-wlm/files/patch-src_common_xsystemd.c | 25 -- .../slurm-wlm/files/patch-src_interfaces_cgroup.c | 18 -- .../patch-src_plugins_auth_slurm_net__aliases.c | 13 -- .../files/patch-src_plugins_auth_slurm_sack.c | 17 -- ...er_user__defaults_cli__filter__user__defaults.c | 10 - ...ns_job__container_tmpfs_job__container__tmpfs.c | 11 - ...rc_plugins_jobacct__gather_common_common__jag.c | 85 ------- ...rc_plugins_mpi_cray__shasta_mpi__cray__shasta.c | 10 - .../files/patch-src_plugins_task_Makefile.in | 11 - .../files/patch-src_plugins_task_pgid_Makefile.in | 97 -------- .../files/patch-src_plugins_task_pgid_task__pgid.c | 155 ------------- sysutils/slurm-wlm/files/patch-src_scrun_anchor.c | 27 --- .../slurm-wlm/files/patch-src_scrun_commands.c | 13 -- sysutils/slurm-wlm/files/patch-src_scrun_scrun.c | 24 -- sysutils/slurm-wlm/files/patch-src_scrun_srun.c | 12 - .../files/patch-src_slurmd_slurmd_slurmd.c | 50 ---- .../files/patch-src_slurmd_slurmd_slurmd.h | 10 - .../files/patch-src_slurmd_slurmstepd_req.c | 15 -- sysutils/slurm-wlm/files/pkg-message.in | 31 +++ sysutils/slurm-wlm/pkg-plist | 85 ++++--- 30 files changed, 142 insertions(+), 1416 deletions(-) diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 20e26e249c49..9dcd334a93d1 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -1,6 +1,5 @@ PORTNAME= slurm -DISTVERSION= 23.11.7 -PORTREVISION= 12 +DISTVERSION= 25.11.0 CATEGORIES= sysutils MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm @@ -15,40 +14,52 @@ LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc powerpcspe NOT_FOR_ARCHS_REASON= 32-bit support is deprecated -LIB_DEPENDS= libjson-c.so:devel/json-c \ - libsysinfo.so:devel/libsysinfo \ - libmunge.so:security/munge \ +LIB_DEPENDS= libhttp_parser.so:www/http-parser \ + libjson-c.so:devel/json-c \ + libjwt.so:www/libjwt \ liblz4.so:archivers/liblz4 \ - libze_loader.so:devel/level-zero \ - libhttp_parser.so:www/http-parser \ - libunwind.so:devel/libunwind \ + libmunge.so:security/munge \ librdkafka.so:net/librdkafka \ - libyaml.so:textproc/libyaml \ - libdbus-1.so:devel/dbus \ - libcheck.so:devel/check \ - libtbb.so:devel/onetbb \ - libjwt.so:www/libjwt - -USES= compiler:c11 cpe gmake gnome libtool localbase lua mysql:client \ - perl5 pkgconfig python:build readline shebangfix ssl tar:bz2 -USE_PERL5= build + libsysinfo.so:devel/libsysinfo \ + libunwind.so:devel/libunwind \ + libyaml.so:textproc/libyaml + +USES= compiler:c11 cpe gmake libtool localbase lua mysql:client perl5 \ + pkgconfig python:build readline shebangfix ssl tar:bz2 CPE_VENDOR= schedmd USE_LDCONFIG= yes +USE_PERL5= build USE_RC_SUBR= slurmctld slurmd -USERS= slurm -GROUPS= ${USERS} +SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +# FreeBSD Infiniband support is still experimental +# slurmrestd does not build on FreeBSD +CONFIGURE_ARGS= --disable-dependency-tracking \ + --disable-slurmrestd \ + --docdir=${DOCSDIR} \ + --htmldir=${DOCSDIR} \ + --sysconfdir=${ETCDIR} \ + --with-mysql_config=${LOCALBASE}/bin +CONFIGURE_ENV= MAKE=${GMAKE} + INSTALL_TARGET= install-strip TEST_TARGET= check -PLIST_SUB= PORTVERSION="${DISTVERSION}" VER="${DISTVERSION:R}" \ - USERS=${USERS} GROUPS=${GROUPS} -SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py + +CFLAGS+= -I${WRKSRC}/slurm +LDFLAGS+= -lsysinfo -lprocstat -fcommon + +SUB_FILES= pkg-message + +USERS= ${PORTNAME} +GROUPS= ${PORTNAME} + +PLIST_SUB= GROUPS=${GROUPS} \ + USERS=${USERS} PORTDOCS= * -OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI RRD +OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI OPTIONS_DEFAULT= HDF5 HWLOC OPTIONS_SUB= yes @@ -57,96 +68,44 @@ GUI_DESC= Build sview GUI config tool HDF5_DESC= Job profiling using HDF5 HWLOC_DESC= Portable hardware locality IPMI_DESC= IPMI energy consumption accounting -RRD_DESC= RRD external sensor data collection - -DOCS_BUILD_DEPENDS= man2html:textproc/man2html CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= libcurl +DOCS_BUILD_DEPENDS= man2html:textproc/man2html + +GUI_BUILD_DEPENDS= itstool:textproc/itstool +GUI_USES= gnome GUI_USE= GNOME=cairo,gdkpixbuf,glib20,gtk20,pango -GUI_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz -GUI_USES= gettext GUI_CONFIGURE_ENABLE= glibtest gtktest x11 -HDF5_LIB_DEPENDS= libhdf5_cpp.so:science/hdf5 \ - libsz.so:science/libaec +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ + libhdf5_hl.so:science/hdf5 HDF5_CONFIGURE_WITH= hdf5 -HDF5_CONFIGURE_ENV= H5CC=${LOCALBASE}/bin/h5cc +HDF5_CONFIGURE_ENV= H5CC=${LOCALBASE}/bin/h5cc \ + H5FC=${LOCALBASE}/bin/h5fc +HDF5_LDFLAGS= -lhdf5_hl HWLOC_LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 HWLOC_CONFIGURE_WITH= hwloc -IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi +IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi \ + libipmimonitoring.so:sysutils/freeipmi IPMI_CONFIGURE_WITH= freeipmi -RRD_LIB_DEPENDS= librrd.so:databases/rrdtool -RRD_CONFIGURE_WITH= rrdtool - -# FreeBSD Infiniband support is still experimental -# slurmrestd does not build on FreeBSD -CONFIGURE_ARGS= --disable-slurmrestd --with-mysql_config=${LOCALBASE}/bin \ - --docdir=${DOCSDIR} --htmldir=${DOCSDIR} - -CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include \ - -I${LOCALBASE}/include/level_zero \ - -I${LOCALBASE}/include/librdkafka \ - -fcommon -D__BSD_VISIBLE=1 -LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lprocstat -fcommon - -PROC2FIX= common/callerid.c common/fd.c common/fetch_config.c \ - interfaces/proctrack.c \ - plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \ - plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \ - plugins/burst_buffer/common/burst_buffer_common.c \ - plugins/cgroup/v1/xcgroup.c plugins/cgroup/v2/cgroup_v2.c \ - plugins/gpu/nvml/gpu_nvml.c \ - plugins/job_container/tmpfs/job_container_tmpfs.c \ - plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \ - plugins/jobacct_gather/common/common_jag.c \ - plugins/jobacct_gather/linux/jobacct_gather_linux.c \ - plugins/node_features/knl_generic/node_features_knl_generic.c \ - plugins/proctrack/cgroup/proctrack_cgroup.c \ - plugins/proctrack/cray_aries/proctrack_cray_aries.c \ - plugins/proctrack/linuxproc/kill_tree.c \ - plugins/proctrack/pgid/proctrack_pgid.c \ - plugins/switch/cray_aries/scaling.c \ - plugins/task/affinity/affinity.c slurmd/common/set_oomadj.c \ - slurmd/common/xcpuinfo.c slurmd/slurmstepd/pdebug.c \ - slurmctld/controller.c \ - slurmd/slurmd/slurmd.c \ - slurmd/slurmstepd/req.c - -LLD2FIX= api plugins/openapi sacctmgr sackd scontrol scrontab scrun \ - slurmctld slurmd/slurmd squeue - -.include <bsd.port.options.mk> - -post-extract: - @${MKDIR} ${WRKSRC}/src/plugins/task/pgid -# Use an existing plugin's Makefile.in as a template - @${CP} ${WRKSRC}/src/plugins/task/cray_aries/Makefile.in \ - ${WRKSRC}/src/plugins/task/pgid/Makefile.in - -# Hack around nonfunctional --disable-gtktest flag -pre-configure-GUI-off: - ${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \ - ${WRKSRC}/configure +_ARCH= ${ARCH:S|aarch64|aarch64elf|:S|amd64|elf_amd64|:S|powerpc64|elf64ppc|:S|powerpc64le|elf64lppc|:S|riscv64|elf64lriscv|} # SLURM's configure enables interactive jobs if pty.h exists. Replacing # #include <pty.h> with appropriate headers will therefore not work, so instead # add a pty.h for the build. pre-configure: ${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm - ${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/configure -.for src in ${PROC2FIX} - ${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \ - -e 's|(/proc)|(/compat/linux/proc)|g' \ - ${WRKSRC}/src/${src} -.endfor + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure +# Make /proc => /compat/linux/proc edits only in files that exist & contain "/proc" + (cd ${WRKSRC} && \ + ${GREP} -RIl '"/proc' src | ${XARGS} ${REINPLACE_CMD} \ + -e 's|"/proc|"/compat/linux/proc|g' \ + -e 's|(/proc)|(/compat/linux/proc)|g') @if ${WHICH} sbatch > /dev/null; then \ ${ECHO_CMD} "********************************************"; \ ${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \ @@ -154,26 +113,22 @@ 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} \ +# Fix lld binary-blob rule: add -m ${_ARCH} wherever --format=binary is used + ${FIND} ${WRKSRC} -name Makefile.in -print0 | \ + ${XARGS} -0 ${GREP} -Il -- '--format=binary' | \ + ${XARGS} ${REINPLACE_CMD} -e 's|$$(LD) -r -o|$$(LD) -r -m ${_ARCH} -o|' + ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|htmldir = \$${datadir.*$$|htmldir = @htmldir@|' +# Hack around nonfunctional --disable-gtktest flag +pre-configure-GUI-off: + ${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \ + ${WRKSRC}/configure + post-install: - @${MKDIR} ${STAGEDIR}/var/spool/slurmctld - @${CHMOD} 700 ${STAGEDIR}/var/spool/slurmctld + @${MKDIR} ${STAGEDIR}/var/spool/slurmctld \ + ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \ - ${STAGEDIR}${PREFIX}/etc/slurm.conf.sample + ${STAGEDIR}${ETCDIR}/slurm.conf.sample .include <bsd.port.mk> diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo index f978435d926a..95b9151f9a8a 100644 --- a/sysutils/slurm-wlm/distinfo +++ b/sysutils/slurm-wlm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716405702 -SHA256 (slurm-23.11.7.tar.bz2) = 09d07c7f625c0fdf4eb9116b3be4f15e7a1bfe83a0744bddf98cbd82ee2fb6b4 -SIZE (slurm-23.11.7.tar.bz2) = 7397601 +TIMESTAMP = 1762496373 +SHA256 (slurm-25.11.0.tar.bz2) = d63f585a73f3d504ddce42ed7205b75e4d79372a43e0f47535cd51ecc5383d09 +SIZE (slurm-25.11.0.tar.bz2) = 6714268 diff --git a/sysutils/slurm-wlm/files/patch-configure b/sysutils/slurm-wlm/files/patch-configure deleted file mode 100644 index f95b552a6dab..000000000000 --- a/sysutils/slurm-wlm/files/patch-configure +++ /dev/null @@ -1,251 +0,0 @@ ---- configure.orig 2024-05-21 17:19:51 UTC -+++ configure -@@ -5513,7 +5513,7 @@ _ACEOF - /* end confdefs.h. */ - $ac_c_conftest_c99_program - _ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -+for ac_arg in '' -std=gnu99 -qlanglvl=extc1x -qlanglvl=extc99 - do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -@@ -6659,7 +6659,7 @@ _ACEOF - /* end confdefs.h. */ - $ac_c_conftest_c99_program - _ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -+for ac_arg in '' -std=gnu99 -qlanglvl=extc1x -qlanglvl=extc99 - do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -@@ -7270,7 +7270,7 @@ _ACEOF - /* end confdefs.h. */ - $ac_cxx_conftest_cxx98_program - _ACEOF --for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -+for ac_arg in '' -std=gnu++98 -qlanglvl=extended -AA - do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -@@ -12320,7 +12320,7 @@ printf %s "checking whether the $compiler linker ($LD) - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no -- link_all_deplibs=unknown -+ link_all_deplibs=no - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= -@@ -12622,7 +12622,7 @@ _LT_EOF - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - fi - ;; - -@@ -12641,7 +12641,7 @@ _LT_EOF - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -12670,7 +12670,7 @@ _LT_EOF - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -12688,7 +12688,7 @@ _LT_EOF - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -13344,7 +13344,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' - hardcode_libdir_flag_spec='$wl-rpath,$libdir' - export_dynamic_flag_spec='$wl-E' - else -@@ -14194,7 +14194,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no -@@ -15345,7 +15345,7 @@ printf %s "checking whether stripping libraries is pos - old_striplib= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 - printf %s "checking whether stripping libraries is possible... " >&6; } --if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -15592,7 +15592,7 @@ module_expsym_cmds_CXX= - inherit_rpath_CXX=no - module_cmds_CXX= - module_expsym_cmds_CXX= --link_all_deplibs_CXX=unknown -+link_all_deplibs_CXX=no - old_archive_cmds_CXX=$old_archive_cmds - reload_flag_CXX=$reload_flag - reload_cmds_CXX=$reload_cmds -@@ -15806,7 +15806,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - # archiving commands below assume that GNU ld is being used. - if test yes = "$with_gnu_ld"; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' -@@ -16502,7 +16502,7 @@ fi - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= -@@ -16510,7 +16510,7 @@ fi - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no -@@ -16542,7 +16542,7 @@ fi - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - esac - -@@ -16553,7 +16553,7 @@ fi - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-version-script $wl$lib-ver' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -16587,7 +16587,7 @@ fi - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object_CXX=yes -@@ -16655,7 +16655,7 @@ fi - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib' - export_dynamic_flag_spec_CXX='$wl-E' - whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - fi -@@ -18186,7 +18186,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no -@@ -21930,7 +21930,7 @@ case $host_os in - - case $host_os in - -- freebsd*) -+dragonfly* | freebsd*) - - # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) - # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -@@ -22897,24 +22897,19 @@ HDF5 support is being disabled (equivalent to --with-h - with_hdf5="no" - with_hdf5_fortran="no" - else -- HDF5_SHOW=$(eval $H5CC -show) -+ HDF5_SHOW=`$PKG_CONFIG --cflags hdf5 --libs hdf5` - -- HDF5_CC=$(eval $H5CC -show | head -n 1 | $AWK '{print $1}') -- if test "$HDF5_CC" = "ccache"; then -- HDF5_CC=$(eval $H5CC -show | head -n 1 | $AWK '{print $2}') -- fi -+ HDF5_CC=$CC - - -- HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \ -- | $AWK '{print $3}') -+ HDF5_VERSION=`$GREP 'HDF5 Version:' /usr/local/lib/libhdf5.settings \ -+ | $AWK '{print $3}'` - -- HDF5_tmp_flags=$(eval $H5CC -showconfig \ -- | $GREP 'FLAGS\|Extra libraries:' \ -- | $AWK -F: '{printf("%s "), $2}' ) -+ HDF5_tmp_flags=`$GREP 'FLAGS\|Extra libraries:' /usr/local/lib/libhdf5.settings \ -+ | $AWK -F: '{printf("%s "), $2}'` - -- HDF5_tmp_inst=$(eval $H5CC -showconfig \ -- | $GREP 'Installation point:' \ -- | $AWK '{print $NF}' ) -+ HDF5_tmp_inst=`$GREP 'Installation point:' /usr/local/lib/libhdf5.settings \ -+ | $AWK '{print $NF}'` - - HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include" - -@@ -23062,7 +23057,7 @@ printf "%s\n" "$H5FC" >&6; } - with_hdf5_fortran="yes" - - -- for arg in `$H5FC -show` -+ for arg in `$PKG_CONFIG --cflags hdf5_fortran --libs hdf5_fortran` - do - case "$arg" in #( - -I*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \ -@@ -23172,7 +23167,7 @@ fi - - if test "$ax_compare_version" = "true" ; then - --printf "%s\n" "#define H5_NO_DEPRECATED_SYMBOLS 1" >>confdefs.h -+# Remove on FreeBSD ports because we use 1.12 with 1.10 API - - else - printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h -@@ -28035,7 +28030,7 @@ printf "%s\n" "${x_ac_deprecated=no}" >&6; } - - - --ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/openlava/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/pmi/Makefile contribs/pmi2/Makefile contribs/seff/Makefile contribs/sgather/Makefile contribs/sjobexit/Makefile contribs/torque/Makefile doc/Makefile doc/html/Makefile doc/html/configurator.easy.html doc/html/configurator.html doc/man/Makefile doc/man/man1/Makefile doc/man/man5/Makefile doc/man/man8/Makefile etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/interfaces/Makefile src/lua/Makefile src/plugins/Makefile src/plugins/accounting_ storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/gpu/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/sysfs/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge /Makefile src/plugins/auth/none/Makefile src/plugins/auth/slurm/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/lua/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cgroup/v2/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/cred/Makefile src/plugins/cred/common/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/data_parser/Makefile src/plugins/data_parser/v0.0.39/Makefile src/plugins/data_parser/v0.0.40/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/gpu/Makefile src/plugins/gpu/common/Makefile src/pl ugins/gpu/generic/Makefile src/plugins/gpu/nrt/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/oneapi/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/mps/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/shard/Makefile src/plugins/hash/Makefile src/plugins/hash/k12/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/cgroup/Makefile s rc/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/common/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/kafka/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/script/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/user/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/node_features/Makefile src/plugins/node_features/helpers/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/preempt/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/pl ugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/example/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/hpe_slingshot/Makefile src/plugins/task/Makefile src/plugi ns/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/block/Makefile src/plugins/topology/common/Makefile src/plugins/topology/default/Makefile src/plugins/topology/tree/Makefile src/sacct/Makefile src/sackd/Makefile src/sacctmgr/Makefile src/salloc/Makefile src/sattach/Makefile src/scrun/Makefile src/sbatch/Makefile src/sbcast/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/slurmrestd/plugins/openapi/Makefile src/slurmrestd/plugins/openapi/dbv0.0.38/Makefil e src/slurmrestd/plugins/openapi/dbv0.0.39/Makefile src/slurmrestd/plugins/openapi/slurmctld/Makefile src/slurmrestd/plugins/openapi/slurmdbd/Makefile src/slurmrestd/plugins/openapi/v0.0.38/Makefile src/slurmrestd/plugins/openapi/v0.0.39/Makefile src/sprio/Makefile src/squeue/Makefile src/sreport/Makefile src/srun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile testsuite/Makefile testsuite/testsuite.conf.sample testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile" -+ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/openlava/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/pmi/Makefile contribs/pmi2/Makefile contribs/seff/Makefile contribs/sgather/Makefile contribs/sjobexit/Makefile contribs/torque/Makefile doc/Makefile doc/html/Makefile doc/html/configurator.easy.html doc/html/configurator.html doc/man/Makefile doc/man/man1/Makefile doc/man/man5/Makefile doc/man/man8/Makefile etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/interfaces/Makefile src/lua/Makefile src/plugins/Makefile src/plugins/accounting_ storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/gpu/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/sysfs/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge /Makefile src/plugins/auth/none/Makefile src/plugins/auth/slurm/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/lua/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cgroup/v2/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/cred/Makefile src/plugins/cred/common/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/data_parser/Makefile src/plugins/data_parser/v0.0.39/Makefile src/plugins/data_parser/v0.0.40/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/gpu/Makefile src/plugins/gpu/common/Makefile src/pl ugins/gpu/generic/Makefile src/plugins/gpu/nrt/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/oneapi/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/mps/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/shard/Makefile src/plugins/hash/Makefile src/plugins/hash/k12/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/cgroup/Makefile s rc/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/common/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/kafka/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/script/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/user/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/node_features/Makefile src/plugins/node_features/helpers/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/preempt/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/pl ugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/example/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/hpe_slingshot/Makefile src/plugins/task/Makefile src/plugi ns/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/pgid/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/block/Makefile src/plugins/topology/common/Makefile src/plugins/topology/default/Makefile src/plugins/topology/tree/Makefile src/sacct/Makefile src/sackd/Makefile src/sacctmgr/Makefile src/salloc/Makefile src/sattach/Makefile src/scrun/Makefile src/sbatch/Makefile src/sbcast/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/slurmrestd/plugins/openapi/Makefile src/slurmrestd/pl ugins/openapi/dbv0.0.38/Makefile src/slurmrestd/plugins/openapi/dbv0.0.39/Makefile src/slurmrestd/plugins/openapi/slurmctld/Makefile src/slurmrestd/plugins/openapi/slurmdbd/Makefile src/slurmrestd/plugins/openapi/v0.0.38/Makefile src/slurmrestd/plugins/openapi/v0.0.39/Makefile src/sprio/Makefile src/squeue/Makefile src/sreport/Makefile src/srun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile testsuite/Makefile testsuite/testsuite.conf.sample testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile" - - - cat >confcache <<\_ACEOF diff --git a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example b/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example deleted file mode 100644 index ce9c31fd439b..000000000000 --- a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example +++ /dev/null @@ -1,116 +0,0 @@ ---- etc/slurm.conf.example.orig 2023-11-21 22:33:29 UTC -+++ etc/slurm.conf.example -@@ -8,8 +8,9 @@ - # Put this file on all nodes of your cluster. - # See the slurm.conf man page for more information. - # --ClusterName=cluster --SlurmctldHost=linux0 -+ClusterName=Beastie -+# Short hostname of the head node -+SlurmctldHost=head - #SlurmctldHost= - # - #DisableRootJobs=NO -@@ -41,7 +42,7 @@ ProctrackType=proctrack/cgroup - #PrologFlags= - #PrologSlurmctld= - #PropagatePrioProcess=0 --#PropagateResourceLimits= -+PropagateResourceLimits=NONE - #PropagateResourceLimitsExcept= - #RebootProgram= - ReturnToService=1 -@@ -58,6 +59,8 @@ TaskPlugin=task/affinity - SwitchType=switch/none - #TaskEpilog= - TaskPlugin=task/affinity -+TaskPluginParam=cores -+# For debugging: TaskPluginParam=cores,verbose - #TaskProlog= - #TopologyPlugin=topology/tree - #TmpFS=/tmp -@@ -88,11 +91,12 @@ Waittime=0 - # - # - # SCHEDULING --#DefMemPerCPU=0 -+DefMemPerCPU=256 - #MaxMemPerCPU=0 - #SchedulerTimeSlice=30 - SchedulerType=sched/backfill - SelectType=select/cons_tres -+SelectTypeParameters=CR_Core_Memory - # - # - # JOB PRIORITY -@@ -115,9 +119,11 @@ SelectType=select/cons_tres - #AccountingStorageHost= - #AccountingStoragePass= - #AccountingStoragePort= --AccountingStorageType=accounting_storage/none -+#AccountingStorageType=accounting_storage/slurmdb -+#AccountingStorageLoc=/home/slurm/Accounting -+#AccountingStoreJobComment=YES - #AccountingStorageUser= --#AccountingStoreFlags= -+AccountingStoreFlags=job_comment - #JobCompHost= - #JobCompLoc= - #JobCompPass= -@@ -128,9 +134,9 @@ SlurmctldDebug=info - JobAcctGatherFrequency=30 - JobAcctGatherType=jobacct_gather/none - SlurmctldDebug=info --SlurmctldLogFile=/var/log/slurmctld.log -+SlurmctldLogFile=/var/log/slurm/slurmctld - SlurmdDebug=info --SlurmdLogFile=/var/log/slurmd.log -+SlurmdLogFile=/var/log/slurm/slurmd - #SlurmSchedLogFile= - #SlurmSchedLogLevel= - #DebugFlags= -@@ -148,6 +154,41 @@ SlurmdLogFile=/var/log/slurmd.log - #SuspendTime= - # - # -+ -+############################################################################ -+# Enable power saving if remote IPMI power-on is available on compute nodes. -+# If unavailable on some nodes, list them in SuspendExcNodes. -+# SlurmUser must be a member of operator and wheel and have a valid -+# login shell in order to execute shutdown on compute nodes. -+# If you prefer to control power manually, see the following scripts -+# from the SPCM port: -+ # -+# auto-ipmi-remote-power -+# cluster-power-saver -+# cluster-power-waster -+# cluster-ipmi-power-on -+############################################################################ -+ -+# SuspendProgram=/usr/local/etc/spcm/slurm-node-suspend -+# SuspendTime should be >= SuspendTimeout + ResumeTimeout. -+# SuspendTime=600 -+# SuspendTimeout=60 -+# -+# ResumeProgram=/usr/local/etc/spcm/slurm-node-resume -+# ResumeTimeout=300 -+# BatchStartTimeout=300 -+# -+# Exempt compute nodes that double as file servers or don't have IPMI -+# remote power-on enabled. -+# -+# SuspendExcNodes=compute-001 -+ -+# - # COMPUTE NODES --NodeName=linux[1-32] CPUs=1 State=UNKNOWN --PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP -+# Set RealMemory < avail memory in /var/run/dmesg.boot -+# Note that it may change slightly following freebsd-update -+NodeName=compute-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=30000 State=UNKNOWN -+# NodeName=compute-256g-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=250000 State=UNKNOWN -+# PartitionName=debug Nodes=ALL Default=NO MaxTime=INFINITE State=UP -+PartitionName=batch Nodes=compute-[001-002] Default=YES MaxTime=INFINITE State=UP -+# PartitionName=256g Nodes=compute-256g-[001-002] Default=NO MaxTime=INFINITE State=UP diff --git a/sysutils/slurm-wlm/files/patch-src_common_callerid.h b/sysutils/slurm-wlm/files/patch-src_common_callerid.h deleted file mode 100644 index e6ad8f5413d2..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_callerid.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/common/callerid.h.orig 2023-06-15 19:16:14 UTC -+++ src/common/callerid.h -@@ -43,6 +43,7 @@ - #ifdef __FreeBSD__ - #include <sys/socket.h> - #include <netinet/in.h> -+#include <netdb.h> - #endif - - typedef struct { diff --git a/sysutils/slurm-wlm/files/patch-src_common_conmgr.c b/sysutils/slurm-wlm/files/patch-src_common_conmgr.c deleted file mode 100644 index 4c2b9a256d57..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_conmgr.c +++ /dev/null @@ -1,49 +0,0 @@ ---- src/common/conmgr.c.orig 2024-05-21 17:19:51 UTC -+++ src/common/conmgr.c -@@ -47,6 +47,8 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <sys/un.h> -+#include <sys/param.h> -+#include <sys/ucred.h> - #include <time.h> - #include <unistd.h> - -@@ -2616,8 +2618,15 @@ static int _create_socket(void *x, void *arg) - - /* set value of socket path */ - strlcpy(addr.sun_path, unixsock, sizeof(addr.sun_path)); -- if ((rc = bind(fd, (const struct sockaddr *) &addr, -- sizeof(addr)))) -+ /* Bind UNIX socket: compute correct length */ -+ { -+ socklen_t len = SUN_LEN(&addr); -+ #if defined(__FreeBSD__) -+ addr.sun_len = (uint8_t)len; -+ #endif -+ rc = bind(fd, (const struct sockaddr *)&addr, len); -+ } -+ if (rc) - fatal("%s: [%s] Unable to bind UNIX socket: %m", - __func__, hostport); - -@@ -2675,6 +2684,19 @@ static int _create_socket(void *x, void *arg) - &one, sizeof(one))) - fatal("%s: [%s] setsockopt(SO_REUSEADDR) failed: %m", - __func__, addrinfo_to_string(addr)); -+ -+ /* For INET/INET6, set *_len on FreeBSD; ai_addrlen is already correct */ -+ #if defined(__FreeBSD__) -+ if (addr->ai_addr) { -+ if (addr->ai_addr->sa_family == AF_INET) { -+ ((struct sockaddr_in *)addr->ai_addr)->sin_len = -+ (uint8_t)sizeof(struct sockaddr_in); -+ } else if (addr->ai_addr->sa_family == AF_INET6) { -+ ((struct sockaddr_in6 *)addr->ai_addr)->sin6_len = -+ (uint8_t)sizeof(struct sockaddr_in6); -+ } -+ } -+ #endif - - if (bind(fd, addr->ai_addr, addr->ai_addrlen) != 0) - fatal("%s: [%s] Unable to bind socket: %m", diff --git a/sysutils/slurm-wlm/files/patch-src_common_net.c b/sysutils/slurm-wlm/files/patch-src_common_net.c deleted file mode 100644 index 8bfdea648018..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_net.c +++ /dev/null @@ -1,68 +0,0 @@ ---- src/common/net.c.orig 2024-05-21 17:19:51 UTC -+++ src/common/net.c -@@ -75,6 +75,29 @@ - #include "src/common/xstring.h" - - /* -+ * Compute correct namelen + sa_len for AF_INET/AF_INET6 -+ */ -+#if defined(__FreeBSD__) -+static inline socklen_t _bsd_sockaddr_len_fix(struct sockaddr *sa) -+{ -+ if (!sa) return 0; -+ switch (sa->sa_family) { -+ case AF_INET: { -+ struct sockaddr_in *in = (struct sockaddr_in *)sa; -+ in->sin_len = (uint8_t)sizeof(*in); -+ return sizeof(*in); -+ } -+ case AF_INET6: { -+ struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)sa; -+ in6->sin6_len = (uint8_t)sizeof(*in6); -+ return sizeof(*in6); -+ } -+ default: return sizeof(*sa); -+ } -+} -+#endif -+ -+/* - * Define slurm-specific aliases for use by plugins, see slurm_xlator.h - * for details. - */ -@@ -96,12 +119,18 @@ int net_stream_listen(int *fd, uint16_t *port) - /* bind ephemeral port */ - slurm_setup_addr(&sin, 0); - -+#if defined(__FreeBSD__) -+ socklen_t blen = _bsd_sockaddr_len_fix((struct sockaddr *)&sin); -+#else -+ socklen_t blen = sizeof(sin); -+#endif - if ((*fd = socket(sin.ss_family, SOCK_STREAM, IPPROTO_TCP)) < 0) - return -1; - - if (setsockopt(*fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) - goto cleanup; -- if (bind(*fd, (struct sockaddr *) &sin, len) < 0) -+ /* Single bind(): pass platform-correct namelen */ -+ if (bind(*fd, (struct sockaddr *) &sin, blen) < 0) - goto cleanup; - if (getsockname(*fd, (struct sockaddr *) &sin, &len) < 0) - goto cleanup; -@@ -219,7 +248,15 @@ static bool _is_port_ok(int s, uint16_t port, bool loc - return false; - } - -+/* -+ * compute correct socket length and pass it to bind() as blen on FreeBSD -+ */ -+#if defined(__FreeBSD__) -+ socklen_t blen = _bsd_sockaddr_len_fix((struct sockaddr *)&addr); -+ if (bind(s, (struct sockaddr *) &addr, blen) < 0) { -+#else - if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { -+#endif - log_flag(NET, "%s: bind() failed on port:%d fd:%d: %m", - __func__, port, s); - return false; diff --git a/sysutils/slurm-wlm/files/patch-src_common_sack__api.c b/sysutils/slurm-wlm/files/patch-src_common_sack__api.c deleted file mode 100644 index fe7520fde339..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_sack__api.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/common/sack_api.c.orig 2024-05-21 17:19:51 UTC -+++ src/common/sack_api.c -@@ -38,6 +38,8 @@ - #include <sys/socket.h> - #include <sys/types.h> - #include <sys/un.h> -+#include <string.h> -+#include <stddef.h> - #include <unistd.h> - - #include "src/common/fd.h" -@@ -63,7 +65,15 @@ static int _sack_try_connection(struct sockaddr_un *ad - static int _sack_try_connection(struct sockaddr_un *addr) - { - int fd; -- size_t len = strlen(addr->sun_path) + 1 + sizeof(addr->sun_family); -+ socklen_t len; -+ -+/* FreeBSD requires sun_len and a correct namelen */ -+#if defined(__FreeBSD__) -+ len = (socklen_t)SUN_LEN(addr); -+ addr->sun_len = (uint8_t)len; -+#else -+ len = (socklen_t)(strlen(addr->sun_path) + 1 + sizeof(addr->sun_family)); -+#endif - - if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - debug3("%s: socket() failed: %m", __func__); diff --git a/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c b/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c deleted file mode 100644 index b4197166e32d..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c +++ /dev/null @@ -1,98 +0,0 @@ ---- src/common/slurm_protocol_socket.c.orig 2024-05-21 17:19:51 UTC -+++ src/common/slurm_protocol_socket.c -@@ -53,7 +53,9 @@ - #include <sys/socket.h> - #include <sys/time.h> - #include <sys/types.h> -+#include <sys/un.h> - #include <unistd.h> -+#include <fcntl.h> - - #include "slurm/slurm_errno.h" - #include "src/common/read_config.h" -@@ -74,6 +76,28 @@ - #define RANDOM_USER_PORT ((uint16_t) ((lrand48() % \ - (MAX_USER_PORT - MIN_USER_PORT + 1)) + MIN_USER_PORT)) - -+#if defined(__FreeBSD__) -+/* Normalize sockaddr length on FreeBSD and return the proper namelen */ -+static inline socklen_t _bsd_sockaddr_len_fix(struct sockaddr *sa) -+{ -+ if (!sa) return 0; -+ switch (sa->sa_family) { -+ case AF_INET: { -+ struct sockaddr_in *in = (struct sockaddr_in *)sa; -+ in->sin_len = (uint8_t)sizeof(*in); -+ return sizeof(*in); -+ } -+ case AF_INET6: { -+ struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)sa; -+ in6->sin6_len = (uint8_t)sizeof(*in6); -+ return sizeof(*in6); -+ } -+ default: -+ return sizeof(*sa); -+ } -+} -+#endif -+ - /* Static functions */ - static int _slurm_connect(int __fd, struct sockaddr const * __addr, - socklen_t __len); -@@ -115,8 +139,13 @@ static void _sock_bind_wild(int sockfd) - - slurm_setup_addr(&sin, RANDOM_USER_PORT); - -+ socklen_t blen = _bsd_sockaddr_len_fix((struct sockaddr *)&sin); - for (retry=0; retry < PORT_RETRIES ; retry++) { -+ #if defined(__FreeBSD__) -+ rc = bind(sockfd, (struct sockaddr *) &sin, blen); -+ #else - rc = bind(sockfd, (struct sockaddr *) &sin, sizeof(sin)); -+ #endif - if (rc >= 0) - break; - slurm_set_port(&sin, RANDOM_USER_PORT); -@@ -511,7 +540,13 @@ extern int slurm_init_msg_engine(slurm_addr_t *addr, b - goto error; - } - -- rc = bind(fd, (struct sockaddr const *) addr, sizeof(*addr)); -+ #if defined(__FreeBSD__) -+ /* FreeBSD: normalize sa_len and pass the exact namelen to bind() */ -+ socklen_t bind_len = _bsd_sockaddr_len_fix((struct sockaddr *)addr); -+ rc = bind(fd, (struct sockaddr const *) addr, bind_len); -+ #else -+ rc = bind(fd, (struct sockaddr const *) addr, sizeof(*addr)); -+ #endif - if (rc < 0) { - format_print(log_lvl, "Error binding slurm stream socket: %m"); - goto error; -@@ -666,7 +701,27 @@ static int _slurm_connect (int __fd, struct sockaddr c - if (fcntl(__fd, F_SETFL, flags | O_NONBLOCK) < 0) - error("%s: fcntl(F_SETFL) error: %m", __func__); - -+/* FreeBSD requires correct sa_len/namelen; recompute here */ -+#if defined(__FreeBSD__) -+ { -+ struct sockaddr *sa = (struct sockaddr *)__addr; -+ socklen_t namelen; -+ switch (sa->sa_family) { -+ case AF_UNIX: { -+ struct sockaddr_un *un = (struct sockaddr_un *)sa; -+ namelen = (socklen_t)SUN_LEN(un); -+ un->sun_len = (uint8_t)namelen; -+ break; -+ } -+ default: -+ namelen = _bsd_sockaddr_len_fix(sa); -+ break; -+ } -+ rc = connect(__fd, sa, namelen); -+ } -+#else - rc = connect(__fd , __addr , __len); -+#endif - if ((rc < 0) && (errno != EINPROGRESS)) - return errno; - if (rc == 0) diff --git a/sysutils/slurm-wlm/files/patch-src_common_stepd__api.c b/sysutils/slurm-wlm/files/patch-src_common_stepd__api.c deleted file mode 100644 index c01bbebffe33..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_common_stepd__api.c +++ /dev/null @@ -1,36 +0,0 @@ ---- src/common/stepd_api.c.orig 2024-05-21 17:19:51 UTC -+++ src/common/stepd_api.c -@@ -48,6 +48,7 @@ - #include <signal.h> - #include <stdlib.h> - #include <string.h> -+#include <stddef.h> - #include <sys/socket.h> - #include <sys/stat.h> - #include <sys/time.h> -@@ -146,7 +147,7 @@ _step_connect(const char *directory, const char *noden - slurm_step_id_t *step_id) *** 966 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69220739.f674.6cbc4a65>