diff options
| author | Mark Felder <feld@FreeBSD.org> | 2015-12-02 20:18:52 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2015-12-02 20:18:52 +0000 |
| commit | 227ecae76e93a33fb10a50310589a30cfca91d90 (patch) | |
| tree | 1ee4abef757469e4feaab5cce6e53e835223e7b1 /devel | |
| parent | java/eclipse: 4.4.2 -> 4.5.1 (diff) | |
devel/pecl-ev: fix patch, port was out of sync with quarterly
Somehow head/devel/pecl-ev and the quarterly version became out of sync.
The quarterly one already had a patch for libev/ev.c that covered the
intended change and more. I can't reproduce a build issue with 10.1 or
9.3, so I'm attempting to re-sync the ports at PORTREVISION=2 and then
we can approach any leftover issues that arise. We should then be able
to do a clean MFH as well.
PR: 204895
Notes
Notes:
svn path=/head/; revision=402851
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pecl-ev/Makefile | 2 | ||||
| -rw-r--r-- | devel/pecl-ev/files/patch-libev_ev.c | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/devel/pecl-ev/Makefile b/devel/pecl-ev/Makefile index 9a724eadf7d4..5d56c83ff066 100644 --- a/devel/pecl-ev/Makefile +++ b/devel/pecl-ev/Makefile @@ -3,7 +3,7 @@ PORTNAME= ev PORTVERSION= 0.2.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- diff --git a/devel/pecl-ev/files/patch-libev_ev.c b/devel/pecl-ev/files/patch-libev_ev.c index 49773a616e52..145718ab0ac4 100644 --- a/devel/pecl-ev/files/patch-libev_ev.c +++ b/devel/pecl-ev/files/patch-libev_ev.c @@ -1,11 +1,18 @@ ---- libev/ev.c.orig 2015-11-29 14:37:29 UTC -+++ libev/ev.c -@@ -1010,7 +1010,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t +--- libev/ev.c.orig 2014-12-08 18:18:51.000000000 +0100 ++++ libev/ev.c 2015-03-01 22:43:14.480908000 +0100 +@@ -1006,12 +1006,12 @@ + } + #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_noreturn ecb_inline void ecb_unreachable (void); - ecb_inline void ecb_unreachable (void) { } +- 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 */ |