svn commit: r386083 - head/databases/tarantool/files

[Antoine Brodin]

Author: antoine
Date: Mon May 11 14:15:34 2015
New Revision: 386083
URL: https://svnweb.freebsd.org/changeset/ports/386083

Log:
  Fix build on head
  
  Reported by:	pkg-fallout

Added:
  head/databases/tarantool/files/patch-third__party_libeio_ecb.h   (contents, props changed)
Modified:
  head/databases/tarantool/files/patch-third_party__libev_ev.c

Added: head/databases/tarantool/files/patch-third__party_libeio_ecb.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/tarantool/files/patch-third__party_libeio_ecb.h	Mon May 11 14:15:34 2015	(r386083)
@@ -0,0 +1,18 @@
+--- third_party/libeio/ecb.h.orig	2014-02-19 14:08:58 UTC
++++ third_party/libeio/ecb.h
+@@ -468,12 +468,12 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
+   }
+ #endif
+ 
+-#if ECB_GCC_VERSION(4,5)
++#if ECB_GCC_VERSION(4,5) || defined __clang__
+   #define ecb_unreachable() __builtin_unreachable ()
+ #else
+   /* this seems to work fine, but gcc always emits a warning for it :/ */
+-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
+-  ecb_inline void ecb_unreachable (void) { }
++  ecb_inline ecb_noreturn void ecb_unreachable (void);
++  ecb_inline ecb_noreturn void ecb_unreachable (void) { }
+ #endif
+ 
+ /* try to tell the compiler that some condition is definitely true */

Modified: head/databases/tarantool/files/patch-third_party__libev_ev.c
==============================================================================
--- head/databases/tarantool/files/patch-third_party__libev_ev.c	Mon May 11 14:08:54 2015	(r386082)
+++ head/databases/tarantool/files/patch-third_party__libev_ev.c	Mon May 11 14:15:34 2015	(r386083)
@@ -1,6 +1,22 @@
---- third_party/libev/ev.c.orig	2013-09-25 17:14:35.398672102 +0000
-+++ third_party/libev/ev.c	2013-09-25 17:15:23.878672738 +0000
-@@ -2226,10 +2226,12 @@
+--- third_party/libev/ev.c.orig	2014-02-19 14:08:58 UTC
++++ third_party/libev/ev.c
+@@ -928,12 +928,12 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
+   }
+ #endif
+ 
+-#if ECB_GCC_VERSION(4,5)
++#if ECB_GCC_VERSION(4,5) || defined __clang__
+   #define ecb_unreachable() __builtin_unreachable ()
+ #else
+   /* this seems to work fine, but gcc always emits a warning for it :/ */
+-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
+-  ecb_inline void ecb_unreachable (void) { }
++  ecb_inline ecb_noreturn void ecb_unreachable (void);
++  ecb_inline ecb_noreturn void ecb_unreachable (void) { }
+ #endif
+ 
+ /* try to tell the compiler that some condition is definitely true */
+@@ -2226,10 +2226,12 @@ ev_recommended_backends (void) EV_THROW
    unsigned int flags = ev_supported_backends ();
  
  #ifndef __NetBSD__