Date: Tue, 26 Jan 2021 02:23:22 +0000 (UTC) From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562629 - in head/sysutils/slurm-wlm: . files Message-ID: <202101260223.10Q2NMKS055753@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jwb Date: Tue Jan 26 02:23:21 2021 New Revision: 562629 URL: https://svnweb.freebsd.org/changeset/ports/562629 Log: sysutils/slurm-wlm: Patch to work with hdf5 1.12 PR: 252567 Submitted by: thierry Modified: head/sysutils/slurm-wlm/Makefile head/sysutils/slurm-wlm/files/patch-configure Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Tue Jan 26 02:10:35 2021 (r562628) +++ head/sysutils/slurm-wlm/Makefile Tue Jan 26 02:23:21 2021 (r562629) @@ -2,7 +2,7 @@ PORTNAME= slurm DISTVERSION= 20.02.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm @@ -21,8 +21,8 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \ libmunge.so:security/munge \ liblz4.so:archivers/liblz4 -USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \ - readline:port shebangfix ssl tar:bz2 +USES= compiler:c11 gmake gnome libtool localbase lua pkgconfig \ + python:build readline:port shebangfix ssl tar:bz2 USE_LDCONFIG= yes USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd @@ -63,6 +63,7 @@ GUI_CONFIGURE_ENABLE= glibtest gtktest x11 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip HDF5_CONFIGURE_WITH= hdf5 +HDF5_CONFIGURE_ENV= H5CC=${LOCALBASE}/bin/h5cc HWLOC_LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 HWLOC_CONFIGURE_WITH= hwloc @@ -96,7 +97,7 @@ pre-configure-GUI-off: pre-configure: @${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm @${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \ - ${WRKSRC}/configure + -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \ -e 's|(/proc)|(/compat/linux/proc)|g' \ Modified: head/sysutils/slurm-wlm/files/patch-configure ============================================================================== --- head/sysutils/slurm-wlm/files/patch-configure Tue Jan 26 02:10:35 2021 (r562628) +++ head/sysutils/slurm-wlm/files/patch-configure Tue Jan 26 02:23:21 2021 (r562629) @@ -1,8 +1,62 @@ ---- configure.orig 2020-11-30 15:56:36 UTC +--- configure.orig 2020-03-26 21:44:05 UTC +++ configure -@@ -24075,8 +24075,24 @@ fi +@@ -20744,25 +20744,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 | $AWK '{print $1}') +- if test "$HDF5_CC" = "ccache"; then +- HDF5_CC=$(eval $H5CC -show | $AWK '{print $2}') +- fi ++ HDF5_CC=$CC ++ HDF5_VERSION=`$GREP 'HDF5 Version:' %%LOCALBASE%%/lib/libhdf5.settings \ ++ | $AWK '{print $3}'` + +- HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \ +- | $AWK '{print $3}') ++ HDF5_tmp_flags=`$GREP 'FLAGS\|Extra libraries:' %%LOCALBASE%%/lib/libhdf5.settings \ ++ | $AWK -F: '{printf("%s "), $2}' ` + +- HDF5_tmp_flags=$(eval $H5CC -showconfig \ +- | $GREP 'FLAGS\|Extra libraries:' \ +- | $AWK -F: '{printf("%s "), $2}' ) ++ HDF5_tmp_inst=`$GREP 'Installation point:' %%LOCALBASE%%/lib/libhdf5.settings \ ++ | $AWK '{print $NF}' ` + +- HDF5_tmp_inst=$(eval $H5CC -showconfig \ +- | $GREP 'Installation point:' \ +- | $AWK '{print $NF}' ) +- + HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include" + + for arg in $HDF5_SHOW $HDF5_tmp_flags ; do +@@ -20907,7 +20901,7 @@ $as_echo "$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 \ +@@ -20967,9 +20961,8 @@ fi + # because slurm uses the 1.8 API. By defining this CPP macro we get + # the 1.8 API. + +-$as_echo "#define H5_NO_DEPRECATED_SYMBOLS 1" >>confdefs.h ++# Remove on FreeBSD ports because we use 1.12 with 1.10 API + +- + # + # Handle user hints + # +@@ -24075,8 +24068,24 @@ fi + + x_ac_lua_pkg_name="lua" - #check for 5.3 then 5.2 then 5.1 - if test -n "$PKG_CONFIG" && \ @@ -27,7 +81,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 ac_status=$? -@@ -24125,6 +24141,8 @@ else +@@ -24125,6 +24134,8 @@ else x_ac_lua_pkg_name=lua-5.1 else x_ac_lua_pkg_name="lua >= 5.1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101260223.10Q2NMKS055753>