diff options
| author | antoine <antoine@FreeBSD.org> | 2015-05-11 22:15:34 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2015-05-11 22:15:34 +0800 |
| commit | 6e88b53be05a8dd9b4f330b893caff8416c35a39 (patch) | |
| tree | 3f2e43c26eb333d8f2390bea4aa4b166f7a34779 /databases | |
| parent | 79438e67cea79e3c5e6e6cc0a37caa74600c74be (diff) | |
| download | freebsd-ports-gnome-6e88b53be05a8dd9b4f330b893caff8416c35a39.tar.gz freebsd-ports-gnome-6e88b53be05a8dd9b4f330b893caff8416c35a39.tar.zst freebsd-ports-gnome-6e88b53be05a8dd9b4f330b893caff8416c35a39.zip | |
Fix build on head
Reported by: pkg-fallout
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/tarantool/files/patch-third__party_libeio_ecb.h | 18 | ||||
| -rw-r--r-- | databases/tarantool/files/patch-third_party__libev_ev.c | 22 |
2 files changed, 37 insertions, 3 deletions
diff --git a/databases/tarantool/files/patch-third__party_libeio_ecb.h b/databases/tarantool/files/patch-third__party_libeio_ecb.h new file mode 100644 index 000000000000..bb4b523c7bfc --- /dev/null +++ b/databases/tarantool/files/patch-third__party_libeio_ecb.h @@ -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 */ diff --git a/databases/tarantool/files/patch-third_party__libev_ev.c b/databases/tarantool/files/patch-third_party__libev_ev.c index 446a86217997..9ac1e2cc2244 100644 --- a/databases/tarantool/files/patch-third_party__libev_ev.c +++ b/databases/tarantool/files/patch-third_party__libev_ev.c @@ -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__ |