mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

sysutils/slurm-wlm: Fix WITHOUT_KERBEROS build and configure issue

Browse Source 
- 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]
This commit is contained in:
Joseph Mingrone 2018-02-20 03:29:51 +00:00
parent 25fc361c2d
commit adc994e914
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=462368
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/slurm-wlm/Makefile
View File

@ -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

41
sysutils/slurm-wlm/files/patch-nokerberos Normal file
View File

@ -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
+