From owner-svn-ports-head@freebsd.org Sun May 15 01:48:25 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94729B32F08; Sun, 15 May 2016 01:48:25 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60E3B185B; Sun, 15 May 2016 01:48:25 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4F1mOJh028339; Sun, 15 May 2016 01:48:24 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4F1mOIR028337; Sun, 15 May 2016 01:48:24 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605150148.u4F1mOIR028337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 15 May 2016 01:48:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415205 - head/sysutils/slurm-wlm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2016 01:48:25 -0000 Author: pi Date: Sun May 15 01:48:24 2016 New Revision: 415205 URL: https://svnweb.freebsd.org/changeset/ports/415205 Log: sysutils/slurm-wlm: improve build on hosts with other ports installed Slurm will try to install different components based on various installed libraries. This patch fixes issues where some files are unexpectedly installed. PR: 209511 Submitted by: Joseph Mingrone (maintainer) Modified: head/sysutils/slurm-wlm/Makefile head/sysutils/slurm-wlm/pkg-plist Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Sun May 15 01:29:24 2016 (r415204) +++ head/sysutils/slurm-wlm/Makefile Sun May 15 01:48:24 2016 (r415205) @@ -15,11 +15,9 @@ COMMENT= Simple Linux Utility for Resour LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libsysinfo.so:devel/libsysinfo \ - libhwloc.so:devel/hwloc \ - libmunge.so:security/munge \ - librrd.so:databases/rrdtool \ - libhdf5.so:science/hdf5 +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libsysinfo.so:devel/libsysinfo \ + libmunge.so:security/munge USERS= slurm GROUPS= ${USERS} @@ -29,16 +27,41 @@ USE_LDCONFIG= yes USE_RC_SUBR= slurmctld slurmd PLIST_SUB= PORTVERSION="${PORTVERSION}" INSTALL_TARGET= install-strip -USES= gmake libtool perl5 pkgconfig python tar:bz2 -GTK2_USE= GNOME=glib20,gtk20 -MYSQL_USE= MYSQL=yes -CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm +USES= gmake libtool pkgconfig python:build tar:bz2 +USE_perl5= configure -OPTIONS_DEFINE= DOCS MYSQL GTK2 +OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD +OPTIONS_DEFAULT=HDF5 HWLOC OPTIONS_SUB= yes -GTK2_DESC= Build GUI config tool sview +CURL_DESC= Require cURL for elasticsearch plugins +GTK2_DESC= Build sview GUI config tool +HDF5_DESC= Job profiling using HDF5 +HWLOC_DESC= Portable hardware locality +IPMI_DESC= IPMI engergy consumption accounting +RRD_DESC= RRD external sensor data collection + +GTK2_USE= GNOME=glib20,gtk20 + +CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_CONFIGURE_with= libcurl + +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 +HDF5_CONFIGURE_WITH= hdf5 + +HWLOC_LIB_DEPENDS= libhwloc.so:devel/hwloc +HWLOC_CONFIGURE_WITH= hwloc + +IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi +IPMI_CONFIGURE_WITH= freeipmi + +RRD_LIB_DEPENDS= librrd.so:databases/rrdtool +RRD_CONFIGURE_WITH= rrdtool + +MYSQL_USE= MYSQL=yes + +CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm # SLURM's configure enables interactive jobs if pty.h exists. Replacing # #include with appropriate headers will therefore not work, so instead Modified: head/sysutils/slurm-wlm/pkg-plist ============================================================================== --- head/sysutils/slurm-wlm/pkg-plist Sun May 15 01:29:24 2016 (r415204) +++ head/sysutils/slurm-wlm/pkg-plist Sun May 15 01:48:24 2016 (r415205) @@ -7,7 +7,7 @@ bin/sbcast bin/scancel bin/scontrol bin/sdiag -bin/sh5util +%%HDF5%%bin/sh5util bin/sinfo bin/smap bin/sprio @@ -59,14 +59,20 @@ lib/slurm/acct_gather_filesystem_none.a lib/slurm/acct_gather_filesystem_none.so lib/slurm/acct_gather_infiniband_none.a lib/slurm/acct_gather_infiniband_none.so -lib/slurm/acct_gather_profile_hdf5.a -lib/slurm/acct_gather_profile_hdf5.so +%%IPMI%%lib/slurm/acct_gather_energy_ipmi.a +%%IPMI%%lib/slurm/acct_gather_energy_ipmi.so +%%HDF5%%lib/slurm/acct_gather_profile_hdf5.a +%%HDF5%%lib/slurm/acct_gather_profile_hdf5.so lib/slurm/acct_gather_profile_none.a lib/slurm/acct_gather_profile_none.so lib/slurm/auth_munge.a lib/slurm/auth_munge.so lib/slurm/auth_none.a lib/slurm/auth_none.so +lib/slurm/burst_buffer_cray.a +lib/slurm/burst_buffer_cray.so +lib/slurm/power_cray.a +lib/slurm/power_cray.so lib/slurm/burst_buffer_generic.a lib/slurm/burst_buffer_generic.so lib/slurm/checkpoint_none.a @@ -83,8 +89,8 @@ lib/slurm/crypto_openssl.a lib/slurm/crypto_openssl.so lib/slurm/ext_sensors_none.a lib/slurm/ext_sensors_none.so -lib/slurm/ext_sensors_rrd.a -lib/slurm/ext_sensors_rrd.so +%%RRD%%lib/slurm/ext_sensors_rrd.a +%%RRD%%lib/slurm/ext_sensors_rrd.so lib/slurm/gres_gpu.a lib/slurm/gres_gpu.so lib/slurm/gres_mic.a @@ -121,6 +127,8 @@ lib/slurm/jobacct_gather_linux.a lib/slurm/jobacct_gather_linux.so lib/slurm/jobacct_gather_none.a lib/slurm/jobacct_gather_none.so +%%CURL%%lib/slurm/jobcomp_elasticsearch.a +%%CURL%%lib/slurm/jobcomp_elasticsearch.so lib/slurm/jobcomp_filetxt.a lib/slurm/jobcomp_filetxt.so %%MYSQL%%lib/slurm/jobcomp_mysql.a