View | Details | Raw Unified | Return to bug 210648 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +11 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	slurm
4
PORTNAME=	slurm
5
PORTVERSION=	15.08.12
5
PORTVERSION=	16.05.4
6
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
7
MASTER_SITES=	http://www.schedmd.com/download/latest/ \
7
MASTER_SITES=	http://www.schedmd.com/download/latest/ \
8
		http://www.schedmd.com/download/archive/ \
8
		http://www.schedmd.com/download/archive/ \
Lines 27-33 Link Here
27
USE_RC_SUBR=	slurmctld slurmd
27
USE_RC_SUBR=	slurmctld slurmd
28
PLIST_SUB=	PORTVERSION="${PORTVERSION}"
28
PLIST_SUB=	PORTVERSION="${PORTVERSION}"
29
INSTALL_TARGET=	install-strip
29
INSTALL_TARGET=	install-strip
30
USES=		gmake libtool pkgconfig python:build tar:bz2
30
USES=		gmake libtool pkgconfig python:build ssl tar:bz2
31
USE_PERL5=	configure
31
USE_PERL5=	configure
32
32
33
OPTIONS_DEFINE=	CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD
33
OPTIONS_DEFINE=	CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD
Lines 41-53 Link Here
41
IPMI_DESC=	IPMI engergy consumption accounting
41
IPMI_DESC=	IPMI engergy consumption accounting
42
RRD_DESC=	RRD external sensor data collection
42
RRD_DESC=	RRD external sensor data collection
43
43
44
GTK2_USE=		GNOME=glib20,gtk20
45
46
DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
44
DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
47
45
48
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
46
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
49
CURL_CONFIGURE_WITH=	libcurl
47
CURL_CONFIGURE_WITH=	libcurl
50
48
49
GTK2_USE=		GNOME=cairo,gdkpixbuf2,glib20,gtk20
50
GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
51
			libfreetype.so:print/freetype2
52
GTK2_USES=		gettext
53
GTK2_CONFIGURE_ENV_OFF=	ac_gtk_test=no
54
51
HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
55
HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
52
			libsz.so:science/szip
56
			libsz.so:science/szip
53
HDF5_CONFIGURE_WITH=	hdf5
57
HDF5_CONFIGURE_WITH=	hdf5
Lines 58-68 Link Here
58
IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
62
IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
59
IPMI_CONFIGURE_WITH=	freeipmi
63
IPMI_CONFIGURE_WITH=	freeipmi
60
64
65
MYSQL_USES=		mysql
66
MYSQL_CONFIGURE_with=	mysql
67
61
RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
68
RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
62
RRD_CONFIGURE_WITH=	rrdtool
69
RRD_CONFIGURE_WITH=	rrdtool
63
70
64
MYSQL_USE=		MYSQL=yes
65
66
CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
71
CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
67
LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
72
LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
68
73
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1464963064
1
TIMESTAMP = 1472066022
2
SHA256 (slurm-15.08.12.tar.bz2) = d73785c17af41996b91806187e3debf7fa6141a459948b1c3c625f92bf7ac3c9
2
SHA256 (slurm-16.05.4.tar.bz2) = 0e047df145c12ce3d723ac239b03450575c3578fd05d8710ab6ec691f4886717
3
SIZE (slurm-15.08.12.tar.bz2) = 5805740
3
SIZE (slurm-16.05.4.tar.bz2) = 5964431
(-)files/patch-src_plugins_node__features_knl__cray_node__features__knl__cray.c (+15 lines)
Line 0 Link Here
1
--- src/plugins/node_features/knl_cray/node_features_knl_cray.c.orig	2016-08-24 19:28:33 UTC
2
+++ src/plugins/node_features/knl_cray/node_features_knl_cray.c
3
@@ -39,6 +39,12 @@
4
 #endif
5
 
6
 #define _GNU_SOURCE	/* For POLLRDHUP */
7
+
8
+#if defined (__FreeBSD__)
9
+#  define POLLRDHUP POLLHUP
10
+#  include <signal.h>
11
+#endif
12
+
13
 #include <ctype.h>
14
 #include <poll.h>
15
 #include <signal.h>
(-)pkg-plist (-7 / +18 lines)
Lines 31-42 Link Here
31
lib/libpmi.so.0.0.0
31
lib/libpmi.so.0.0.0
32
lib/libslurm.a
32
lib/libslurm.a
33
lib/libslurm.so
33
lib/libslurm.so
34
lib/libslurm.so.29
34
lib/libslurm.so.30
35
lib/libslurm.so.29.0.0
35
lib/libslurm.so.30.0.0
36
lib/libslurmdb.a
36
lib/libslurmdb.a
37
lib/libslurmdb.so
37
lib/libslurmdb.so
38
lib/libslurmdb.so.29
38
lib/libslurmdb.so.30
39
lib/libslurmdb.so.29.0.0
39
lib/libslurmdb.so.30.0.0
40
lib/slurm/accounting_storage_filetxt.a
40
lib/slurm/accounting_storage_filetxt.a
41
lib/slurm/accounting_storage_filetxt.so
41
lib/slurm/accounting_storage_filetxt.so
42
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
42
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
Lines 103-110 Link Here
103
lib/slurm/job_container_none.so
103
lib/slurm/job_container_none.so
104
lib/slurm/job_submit_all_partitions.a
104
lib/slurm/job_submit_all_partitions.a
105
lib/slurm/job_submit_all_partitions.so
105
lib/slurm/job_submit_all_partitions.so
106
lib/slurm/job_submit_cnode.a
107
lib/slurm/job_submit_cnode.so
108
lib/slurm/job_submit_cray.a
106
lib/slurm/job_submit_cray.a
109
lib/slurm/job_submit_cray.so
107
lib/slurm/job_submit_cray.so
110
lib/slurm/job_submit_defaults.a
108
lib/slurm/job_submit_defaults.a
Lines 145-150 Link Here
145
lib/slurm/layouts_power_default.so
143
lib/slurm/layouts_power_default.so
146
lib/slurm/layouts_unit_default.a
144
lib/slurm/layouts_unit_default.a
147
lib/slurm/layouts_unit_default.so
145
lib/slurm/layouts_unit_default.so
146
lib/slurm/mcs_group.a
147
lib/slurm/mcs_group.so
148
lib/slurm/mcs_none.a
149
lib/slurm/mcs_none.so
150
lib/slurm/mcs_user.a
151
lib/slurm/mcs_user.so
148
lib/slurm/mpi_lam.a
152
lib/slurm/mpi_lam.a
149
lib/slurm/mpi_lam.so
153
lib/slurm/mpi_lam.so
150
lib/slurm/mpi_mpich1_p4.a
154
lib/slurm/mpi_mpich1_p4.a
Lines 163-168 Link Here
163
lib/slurm/mpi_openmpi.so
167
lib/slurm/mpi_openmpi.so
164
lib/slurm/mpi_pmi2.a
168
lib/slurm/mpi_pmi2.a
165
lib/slurm/mpi_pmi2.so
169
lib/slurm/mpi_pmi2.so
170
lib/slurm/node_features_knl_cray.a
171
lib/slurm/node_features_knl_cray.so
166
lib/slurm/power_none.a
172
lib/slurm/power_none.a
167
lib/slurm/power_none.so
173
lib/slurm/power_none.so
168
lib/slurm/preempt_job_prio.a
174
lib/slurm/preempt_job_prio.a
Lines 404-409 Link Here
404
man/man5/cray.conf.5.gz
410
man/man5/cray.conf.5.gz
405
man/man5/ext_sensors.conf.5.gz
411
man/man5/ext_sensors.conf.5.gz
406
man/man5/gres.conf.5.gz
412
man/man5/gres.conf.5.gz
413
man/man5/knl.conf.5.gz
407
man/man5/nonstop.conf.5.gz
414
man/man5/nonstop.conf.5.gz
408
man/man5/slurm.conf.5.gz
415
man/man5/slurm.conf.5.gz
409
man/man5/slurmdbd.conf.5.gz
416
man/man5/slurmdbd.conf.5.gz
Lines 478-483 Link Here
478
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html
485
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html
479
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
486
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
480
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
487
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
488
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/intel_knl.html
481
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html
489
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html
482
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html
490
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html
483
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html
491
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html
Lines 486-491 Link Here
486
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html
494
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html
487
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html
495
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html
488
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif
496
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif
497
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/knl.conf.html
489
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
498
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
490
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
499
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
491
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
500
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
Lines 494-499 Link Here
494
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
503
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
495
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif
504
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif
496
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html
505
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html
506
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mcs.html
507
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mcs_plugins.html
497
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html
508
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html
498
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/moab.html
509
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/moab.html
499
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html
510
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html
Lines 500-505 Link Here
500
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html
511
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html
501
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html
512
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html
502
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html
513
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html
514
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/node_features_plugins.html
503
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html
515
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html
504
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html
516
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html
505
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif
517
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif
Lines 571-577 Link Here
571
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
583
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
572
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
584
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
573
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
585
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
574
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sun_const.html
575
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
586
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
576
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
587
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
577
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html
588
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html

Return to bug 210648