mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

Fix build on head

Browse Source 
Reported by:	pkg-fallout
This commit is contained in:
Antoine Brodin 2015-05-11 14:15:34 +00:00
parent c77e3148be
commit be7709b088
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=386083
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
databases/tarantool/files/patch-third__party_libeio_ecb.h Normal file
View File

@ -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 */

22
databases/tarantool/files/patch-third_party__libev_ev.c
View File

@ -1,6 +1,22 @@
--- third_party/libev/ev.c.orig 2013-09-25 17:14:35.398672102 +0000 --- third_party/libev/ev.c.orig 2014-02-19 14:08:58 UTC
+++ third_party/libev/ev.c 2013-09-25 17:15:23.878672738 +0000 +++ third_party/libev/ev.c
@@ -2226,10 +2226,12 @@ @@ -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 (); unsigned int flags = ev_supported_backends ();
#ifndef __NetBSD__ #ifndef __NetBSD__