From owner-svn-ports-head@freebsd.org Tue Apr 18 13:38:11 2017 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 8A2A4D43EF5; Tue, 18 Apr 2017 13:38:11 +0000 (UTC) (envelope-from jrm@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 496C9D28; Tue, 18 Apr 2017 13:38:11 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3IDcAP7013432; Tue, 18 Apr 2017 13:38:10 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3IDcAiI013431; Tue, 18 Apr 2017 13:38:10 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201704181338.v3IDcAiI013431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Tue, 18 Apr 2017 13:38:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438780 - 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.23 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: Tue, 18 Apr 2017 13:38:11 -0000 Author: jrm Date: Tue Apr 18 13:38:10 2017 New Revision: 438780 URL: https://svnweb.freebsd.org/changeset/ports/438780 Log: sysutils/slurm-wlm: Add support for the jobacct_gather/linux plugin - The plugin requires linprocfs, so add an off-by-defult option knob to depend on linux. - Patch source files to point to /compat/linux/proc. Submitted by: Jason Bacon Approved by: swills (mentor, implicit) Modified: head/sysutils/slurm-wlm/Makefile Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Tue Apr 18 12:58:16 2017 (r438779) +++ head/sysutils/slurm-wlm/Makefile Tue Apr 18 13:38:10 2017 (r438780) @@ -34,7 +34,7 @@ USES= gmake libtool pkgconfig python:bu USE_PERL5= configure SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py -OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD +OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD LINUX OPTIONS_DEFAULT=HDF5 HWLOC OPTIONS_SUB= yes @@ -44,6 +44,7 @@ HDF5_DESC= Job profiling using HDF5 HWLOC_DESC= Portable hardware locality IPMI_DESC= IPMI engergy consumption accounting RRD_DESC= RRD external sensor data collection +LINUX_DESC= Support jobacct_gather/linux (requires linprocfs) DOCS_BUILD_DEPENDS= man2html:textproc/man2html @@ -75,6 +76,8 @@ MYSQL_CONFIGURE_OFF= --with-mysql_config RRD_LIB_DEPENDS= librrd.so:databases/rrdtool RRD_CONFIGURE_WITH= rrdtool +LINUX_USES= linux + CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm @@ -100,6 +103,31 @@ post-patch: -e 's|SlurmdSpoolDir=.*|SlurmdSpoolDir=/var/spool/slurmd|' \ -e 's|StateSaveLocation=.*|StateSaveLocation=/var/run/slurm|' \ ${WRKSRC}/etc/slurm.conf.example + @${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \ + ${WRKSRC}/src/slurmd/slurmstepd/req.c \ + ${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \ + ${WRKSRC}/src/slurmd/slurmd/get_mach_stat.c \ + ${WRKSRC}/src/slurmd/slurmd/read_proc.c \ + ${WRKSRC}/src/slurmd/common/xcpuinfo.c \ + ${WRKSRC}/src/slurmd/common/xcgroup.c \ + ${WRKSRC}/src/slurmd/common/set_oomadj.c \ + ${WRKSRC}/src/slurmd/common/proctrack.c \ + ${WRKSRC}/src/common/callerid.c \ + ${WRKSRC}/src/plugins/task/affinity/affinity.c \ + ${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \ + ${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \ + ${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \ + ${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \ + ${WRKSRC}/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c \ + ${WRKSRC}/src/plugins/switch/cray/scaling.c \ + ${WRKSRC}/src/plugins/proctrack/cray/proctrack_cray.c \ + ${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \ + ${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \ + ${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \ + ${WRKSRC}/src/plugins/proctrack/lua/proctrack_lua.c \ + ${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \ + ${WRKSRC}/contribs/cray/pam_job.c \ + ${WRKSRC}/contribs/lua/proctrack.lua # Hack around nonfunctional --disable-gtktest flag post-patch-GTK2-off: