svn commit: r557373 - in branches/2020Q4/sysutils/slurm-wlm: . files

[Jason W. Bacon]

Author: jwb
Date: Wed Dec  9 13:44:59 2020
New Revision: 557373
URL: https://svnweb.freebsd.org/changeset/ports/557373

Log:
  MFH: r556796 r557295
  
  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
  
  sysutils/slurm-wlm: Back out -fno-common patches, add -fcommon flag
  
  Fixes runtime regression caused by r546150
  
  Reported by:    jrm
  
  Approved by:	blanket bug fix

Added:
  branches/2020Q4/sysutils/slurm-wlm/files/patch-configure
     - copied unchanged from r556796, head/sysutils/slurm-wlm/files/patch-configure
Deleted:
  branches/2020Q4/sysutils/slurm-wlm/files/patch-c8be6ceb.c
  branches/2020Q4/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c
Modified:
  branches/2020Q4/sysutils/slurm-wlm/Makefile
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/sysutils/slurm-wlm/Makefile
==============================================================================
--- branches/2020Q4/sysutils/slurm-wlm/Makefile	Wed Dec  9 13:42:25 2020	(r557372)
+++ branches/2020Q4/sysutils/slurm-wlm/Makefile	Wed Dec  9 13:44:59 2020	(r557373)
@@ -2,7 +2,7 @@
 
 PORTNAME=	slurm
 DISTVERSION=	20.02.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm
@@ -82,8 +82,8 @@ RRD_CONFIGURE_WITH=	rrdtool
 CONFIGURE_ARGS=	--without-ofed
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 
-CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat
+CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include -fcommon
+LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat -fcommon
 
 # Hack around nonfunctional --disable-gtktest flag
 pre-configure-GUI-off:

Copied: branches/2020Q4/sysutils/slurm-wlm/files/patch-configure (from r556796, head/sysutils/slurm-wlm/files/patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q4/sysutils/slurm-wlm/files/patch-configure	Wed Dec  9 13:44:59 2020	(r557373, copy of r556796, head/sysutils/slurm-wlm/files/patch-configure)
@@ -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