From dded52847df90afdffd7a437187e345e149a1459 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 20 Mar 2016 19:56:59 -0400 Subject: [PATCH] slurm-wlm: update to 15.08.8. --- srcpkgs/slurm-wlm/patches/ino_t.patch | 10 ---------- srcpkgs/slurm-wlm/patches/unistd_h.patch | 11 ----------- srcpkgs/slurm-wlm/template | 18 ++++++++++++------ srcpkgs/slurm-wlm/update | 1 + 4 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/slurm-wlm/patches/ino_t.patch delete mode 100644 srcpkgs/slurm-wlm/patches/unistd_h.patch create mode 100644 srcpkgs/slurm-wlm/update diff --git a/srcpkgs/slurm-wlm/patches/ino_t.patch b/srcpkgs/slurm-wlm/patches/ino_t.patch deleted file mode 100644 index c069c3628d1..00000000000 --- a/srcpkgs/slurm-wlm/patches/ino_t.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/common/callerid.h.bck 2016-01-31 18:43:01.316338469 -0500 -+++ src/common/callerid.h 2016-01-31 18:45:25.654606096 -0500 -@@ -38,6 +38,7 @@ - #define _SLURM_CALLERID_H - - #include -+#include // ino_t - - typedef struct callerid_conn { - uint32_t port_dst; diff --git a/srcpkgs/slurm-wlm/patches/unistd_h.patch b/srcpkgs/slurm-wlm/patches/unistd_h.patch deleted file mode 100644 index 623f605f919..00000000000 --- a/srcpkgs/slurm-wlm/patches/unistd_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/log.c.bck 2016-01-31 18:14:47.208647209 -0500 -+++ src/common/log.c 2016-01-31 18:15:04.634645361 -0500 -@@ -75,7 +75,7 @@ - #include - #include - #include --#include -+#include - - #include "slurm/slurm_errno.h" - #include "src/common/fd.h" diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index cf89f8d406e..ef04dbff6cf 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -1,19 +1,25 @@ # Template file for 'slurm-wlm' pkgname=slurm-wlm -version=15.08.7 +version=15.08.8 revision=1 -wrksrc=slurm-$version +_version="${version//./-}-1" +wrksrc="slurm-slurm-${_version}" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="perl cgit python pkg-config" -makedepends="munge-devel lua-devel hdf5-devel pam-devel libressl-devel gtk+-devel - libnuma-devel ncurses-devel readline-devel rrdtool-devel" +# XXX: ofed, DataWarp, netloc, freeipmi, blcr +makedepends="munge-devel lua-devel pam-devel libressl-devel gtk+-devel + ncurses-devel readline-devel libmysqlclient-devel json-c-devel libhwloc-devel" short_desc="Workload manager for Linux clusters of all sizes" maintainer="Toyam Cox " license="GPL-2" homepage="http://slurm.schedmd.com/slurm.html" -distfiles="http://www.schedmd.com/download/latest/slurm-${version}.tar.bz2" -checksum=1b2b66012799c22e55da75ba3291896438dce84c50975a1ef8e4e5aaf753b7fe +distfiles="https://github.com/SchedMD/slurm/archive/slurm-${_version}.tar.gz" +checksum=b4ad4fa35b5b2d45efb978cb765c28a92d8b8bceb25bcf2c5ea28386e79052f8 case "${XBPS_TARGET_MACHINE}" in *-musl) broken="https://travis-ci.org/voidlinux/void-packages/jobs/106121691";; esac +if [ -z "${CROSS_BUILD}" ]; then + # The below at time of writing can not be cross compiled + makedepends+=" rrdtool-devel hdf5-devel libnuma-devel" +fi diff --git a/srcpkgs/slurm-wlm/update b/srcpkgs/slurm-wlm/update new file mode 100644 index 00000000000..7f648e696ee --- /dev/null +++ b/srcpkgs/slurm-wlm/update @@ -0,0 +1 @@ +pkgname=slurm