svn commit: r419108 - branches/2016Q3/lang/ruby23/files

[Mark Felder]

Author: feld
Date: Tue Jul 26 13:46:47 2016
New Revision: 419108
URL: https://svnweb.freebsd.org/changeset/ports/419108

Log:
  MFH: r418883
  
  Fix build on FreeBSD 11 and later.
  
  Reported by:	KIRIYAMA Kazuhiko <kiri [...] kx.openedu.org>
  Tested by:	Kurt Jaeger <lists [...] opsec.eu>,
  		"Herbert J. Skuhra" <herbert [...] mailbox.org>
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2016Q3/lang/ruby23/files/patch-ccan_list_list.h
     - copied unchanged from r418883, head/lang/ruby23/files/patch-ccan_list_list.h
  branches/2016Q3/lang/ruby23/files/patch-thread__pthread.c
     - copied unchanged from r418883, head/lang/ruby23/files/patch-thread__pthread.c
Modified:
Directory Properties:
  branches/2016Q3/   (props changed)

Copied: branches/2016Q3/lang/ruby23/files/patch-ccan_list_list.h (from r418883, head/lang/ruby23/files/patch-ccan_list_list.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/lang/ruby23/files/patch-ccan_list_list.h	Tue Jul 26 13:46:47 2016	(r419108, copy of r418883, head/lang/ruby23/files/patch-ccan_list_list.h)
@@ -0,0 +1,22 @@
+--- ccan/list/list.h.orig	2015-09-06 07:10:54 UTC
++++ ccan/list/list.h
+@@ -57,7 +57,7 @@ struct list_head
+  * Example:
+  *	static struct list_head my_list = LIST_HEAD_INIT(my_list);
+  */
+-#define LIST_HEAD_INIT(name) { { &name.n, &name.n } }
++#define CCAN_LIST_HEAD_INIT(name) { { &name.n, &name.n } }
+ 
+ /**
+  * LIST_HEAD - define and initialize an empty list_head
+@@ -72,8 +72,8 @@ struct list_head
+  * Example:
+  *	static LIST_HEAD(my_global_list);
+  */
+-#define LIST_HEAD(name) \
+-	struct list_head name = LIST_HEAD_INIT(name)
++#define CCAN_LIST_HEAD(name) \
++	struct list_head name = CCAN_LIST_HEAD_INIT(name)
+ 
+ /**
+  * list_head_init - initialize a list_head

Copied: branches/2016Q3/lang/ruby23/files/patch-thread__pthread.c (from r418883, head/lang/ruby23/files/patch-thread__pthread.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/lang/ruby23/files/patch-thread__pthread.c	Tue Jul 26 13:46:47 2016	(r419108, copy of r418883, head/lang/ruby23/files/patch-thread__pthread.c)
@@ -0,0 +1,11 @@
+--- thread_pthread.c.orig	2016-04-15 16:07:07 UTC
++++ thread_pthread.c
+@@ -1154,7 +1154,7 @@ native_sleep(rb_thread_t *th, struct tim
+ }
+ 
+ #ifdef USE_UBF_LIST
+-static LIST_HEAD(ubf_list_head);
++static CCAN_LIST_HEAD(ubf_list_head);
+ 
+ /* The thread 'th' is registered to be trying unblock. */
+ static void