Date: Tue, 20 Feb 2018 03:29:52 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462368 - in head/sysutils/slurm-wlm: . files Message-ID: <201802200329.w1K3Tquc033665@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Tue Feb 20 03:29:51 2018 New Revision: 462368 URL: https://svnweb.freebsd.org/changeset/ports/462368 Log: sysutils/slurm-wlm: Fix WITHOUT_KERBEROS build and configure issue - Fix build when WITHOUT_KERBEROS is used by patching files to remove '#include <roken.h>'. [1] - Fix configure when PREFIX is set to something other than /usr/local. The check for man2html is hard-coded to search /usr/bin and /usr/local/bin. [2] PR: 225989 Submitted by: tijl [1] jwb [2] Added: head/sysutils/slurm-wlm/files/patch-nokerberos (contents, props changed) Modified: head/sysutils/slurm-wlm/Makefile (contents, props changed) Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Tue Feb 20 00:18:30 2018 (r462367) +++ head/sysutils/slurm-wlm/Makefile Tue Feb 20 03:29:51 2018 (r462368) @@ -30,6 +30,7 @@ USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd GNU_CONFIGURE= yes +CONFIGURE_ARGS= --bindir=${PREFIX}/bin INSTALL_TARGET= install-strip PLIST_SUB= PORTVERSION="${PORTVERSION}" SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py Added: head/sysutils/slurm-wlm/files/patch-nokerberos ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-nokerberos Tue Feb 20 03:29:51 2018 (r462368) @@ -0,0 +1,41 @@ +Index: sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c +=================================================================== +--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c.orig 2018-02-20 02:40:20 UTC ++++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c +@@ -0,0 +1,10 @@ ++--- src/plugins/mpi/pmi2/agent.c.orig 2017-11-01 01:04:16 UTC +++++ src/plugins/mpi/pmi2/agent.c ++@@ -39,7 +39,6 @@ ++ \*****************************************************************************/ ++ ++ #if defined(__FreeBSD__) ++-#include <roken.h> ++ #include <sys/socket.h> /* AF_INET */ ++ #endif ++ +--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c.orig 2018-02-20 02:40:20 UTC ++++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c +@@ -0,0 +1,10 @@ ++--- src/plugins/mpi/pmi2/pmi1.c.orig 2017-11-01 01:04:16 UTC +++++ src/plugins/mpi/pmi2/pmi1.c ++@@ -38,7 +38,6 @@ ++ #include "config.h" ++ ++ #if defined(__FreeBSD__) ++-#include <roken.h> ++ #include <sys/socket.h> /* AF_INET */ ++ #endif ++ +--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c.orig 2018-02-20 02:40:20 UTC ++++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c +@@ -0,0 +1,10 @@ ++--- src/plugins/mpi/pmi2/pmi2.c.orig 2017-11-01 01:04:16 UTC +++++ src/plugins/mpi/pmi2/pmi2.c ++@@ -36,7 +36,6 @@ ++ \*****************************************************************************/ ++ ++ #if defined(__FreeBSD__) ++-#include <roken.h> ++ #include <sys/socket.h> /* AF_INET */ ++ #endif ++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802200329.w1K3Tquc033665>