svn commit: r556796 - in head/sysutils/slurm-wlm: . files
Jason W. Bacon
jwb at FreeBSD.org
Tue Dec 1 22:02:48 UTC 2020
Author: jwb
Date: Tue Dec 1 22:02:47 2020
New Revision: 556796
URL: https://svnweb.freebsd.org/changeset/ports/556796
Log:
sysutils/slurm-wlm: Patch in lua 5.4 support
PR opened upstream
Make sure patch files have meaningful names
PR: 251471
Reported by: greg at unrelenting.technology
Added:
head/sysutils/slurm-wlm/files/patch-configure (contents, props changed)
head/sysutils/slurm-wlm/files/patch-src_scancel_scancel.c (contents, props changed)
head/sysutils/slurm-wlm/files/patch-src_scancel_scancel.h (contents, props changed)
Deleted:
head/sysutils/slurm-wlm/files/patch-c8be6ceb.c
Modified:
head/sysutils/slurm-wlm/Makefile
Modified: head/sysutils/slurm-wlm/Makefile
==============================================================================
--- head/sysutils/slurm-wlm/Makefile Tue Dec 1 21:56:16 2020 (r556795)
+++ head/sysutils/slurm-wlm/Makefile Tue Dec 1 22:02:47 2020 (r556796)
@@ -2,7 +2,7 @@
PORTNAME= slurm
DISTVERSION= 20.02.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils python
MASTER_SITES= https://download.schedmd.com/slurm/
PKGNAMESUFFIX= -wlm
Added: head/sysutils/slurm-wlm/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/slurm-wlm/files/patch-configure Tue Dec 1 22:02:47 2020 (r556796)
@@ -0,0 +1,38 @@
+--- configure.orig 2020-11-30 15:56:36 UTC
++++ configure
+@@ -24075,8 +24075,24 @@ fi
+
+
+ x_ac_lua_pkg_name="lua"
+- #check for 5.3 then 5.2 then 5.1
+- if test -n "$PKG_CONFIG" && \
++ #check for 5.4 then 5.3 then 5.2 then 5.1
++if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.4\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua5.4") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ x_ac_lua_pkg_name=lua5.4
++else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.4\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "lua-5.4") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ x_ac_lua_pkg_name=lua-5.4
++else
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
+ ac_status=$?
+@@ -24125,6 +24141,8 @@ else
+ x_ac_lua_pkg_name=lua-5.1
+ else
+ x_ac_lua_pkg_name="lua >= 5.1"
++fi
++fi
+ fi
+ fi
+ fi
Added: head/sysutils/slurm-wlm/files/patch-src_scancel_scancel.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/slurm-wlm/files/patch-src_scancel_scancel.c Tue Dec 1 22:02:47 2020 (r556796)
@@ -0,0 +1,10 @@
+--- src/scancel/scancel.c.orig 2020-03-26 21:44:05 UTC
++++ src/scancel/scancel.c
+@@ -99,6 +99,7 @@ static pthread_cond_t num_active_threads_cond;
+ static pthread_mutex_t max_delay_lock;
+ static uint32_t max_resp_time = 0;
+ static int request_count = 0;
++opt_t opt;
+
+ int
+ main (int argc, char **argv)
Added: head/sysutils/slurm-wlm/files/patch-src_scancel_scancel.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/slurm-wlm/files/patch-src_scancel_scancel.h Tue Dec 1 22:02:47 2020 (r556796)
@@ -0,0 +1,11 @@
+--- src/scancel/scancel.h.orig 2020-03-26 21:44:05 UTC
++++ src/scancel/scancel.h
+@@ -75,7 +75,7 @@ typedef struct scancel_options {
+ bool *job_pend; /* Set fi job is pending */
+ } opt_t;
+
+-opt_t opt;
++extern opt_t opt;
+
+ /* process options:
+ * 1. set defaults
More information about the svn-ports-all
mailing list