summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2016-04-07 00:48:21 +0200
committerGordian Edenhofer2016-04-07 00:48:21 +0200
commitd2266d5cd27b15364a274f3df4a481181def45ee (patch)
tree435c0db8e405ea12e98e008303caf768aca2693e
parent46aeeec34469492181b09e128eab1a2a4f07373a (diff)
downloadaur-d2266d5cd27b15364a274f3df4a481181def45ee.tar.gz
Upgpkg: 27593.33557de-1
Set some more configure flags to compile more libraries into the final package in the hope that users do not have to recompile after installing a new optdep. Trigger autogen.sh for an up-to-date ./configure script.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD20
-rw-r--r--slurm-llnl-git.install5
3 files changed, 15 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 20319bdea039..97a39f90a2a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = slurm-llnl-git
pkgdesc = Simple Linux Utility for Resource Management (development version)
- pkgver = 27552.a685e0e
+ pkgver = 27593.33557de
pkgrel = 1
url = http://www.schedmd.com
install = slurm-llnl-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 3ea79d5eff96..66b0d96b00fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
pkgname=slurm-llnl-git
-pkgver=27552.a685e0e
+pkgver=27593.33557de
pkgrel=1
pkgdesc="Simple Linux Utility for Resource Management (development version)"
arch=('i686' 'x86_64')
@@ -29,7 +29,7 @@ makedepends=('python' 'git')
provides=('slurm-llnl')
conflicts=('slurm-llnl' 'slurm-llnl-dev')
backup=('etc/default/slurm-llnl')
-install=${pkgname}.install
+install="${pkgname}.install"
source=("slurm-tmpfiles.conf"
"slurm-llnl-default-conf"
"slurmctld.service"
@@ -58,11 +58,19 @@ build() {
#
# Read http://slurm.schedmd.com/quickstart_admin.html for more information
+ ./autogen.sh
./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc/slurm-llnl \
- --localstatedir=/var
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/slurm-llnl \
+ --localstatedir=/var \
+ --enable-pam \
+ --with-proctrack \
+ --with-hdf5 \
+ --with-hwloc \
+ --with-rrdtool \
+ --with-ssl \
+ --with-munge
make
}
diff --git a/slurm-llnl-git.install b/slurm-llnl-git.install
index 17a84b71daf6..77a897dd2db3 100644
--- a/slurm-llnl-git.install
+++ b/slurm-llnl-git.install
@@ -21,16 +21,11 @@ post_install() {
echo -e "\e[34;1m==>\e[39;1m NOTE: You have to create a slurm configuration-file in /etc/slurm-llnl/ \e[0m"
echo -e "\e[34;1m==>\e[39;1m prior to starting any slurm daemons. \e[0m"
- echo -e "\e[34;1m==>\e[39;1m NOTE: In order for new optional dependencies to be taken into account \e[0m"
- echo -e "\e[34;1m==>\e[39;1m slurm-llnl has to be recompiled. \e[0m"
}
## arg 1: the new package version
## arg 2: the old package version
post_upgrade() {
- echo -e "\e[34;1m==>\e[39;1m NOTE: In order for new optional dependencies to be taken into account \e[0m"
- echo -e "\e[34;1m==>\e[39;1m slurm-llnl has to be recompiled. \e[0m"
-
# THIS HAS TO BE REMOVED ONEDAY - TODO
if [ -f /etc/slurm/slurm.conf ]; then
mv /etc/slurm/* /etc/slurm-llnl/