Date: Wed, 6 May 2015 14:40:04 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385520 - head/devel/rubygem-cool.io/files Message-ID: <201505061440.t46Ee4dZ031971@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed May 6 14:40:03 2015 New Revision: 385520 URL: https://svnweb.freebsd.org/changeset/ports/385520 Log: Fix the patch to fix build with clang 3.6, it seems it was applied twice Modified: head/devel/rubygem-cool.io/files/patch-ext__libev__ev.c Modified: head/devel/rubygem-cool.io/files/patch-ext__libev__ev.c ============================================================================== --- head/devel/rubygem-cool.io/files/patch-ext__libev__ev.c Wed May 6 14:34:39 2015 (r385519) +++ head/devel/rubygem-cool.io/files/patch-ext__libev__ev.c Wed May 6 14:40:03 2015 (r385520) @@ -1,21 +1,18 @@ ---- devel/rubygem-cool.io/files/patch-ext__libev__ev.c (revision 0) -+++ devel/rubygem-cool.io/files/patch-ext__libev__ev.c (working copy) -@@ -0,0 +1,18 @@ -+--- ext/libev/ev.c.orig 2015-02-24 21:12:24.501215000 +0100 -++++ ext/libev/ev.c 2015-02-24 21:16:08.576108000 +0100 -+@@ -967,12 +967,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_inline void ecb_unreachable (void) { } -++ ecb_inline void ecb_noreturn ecb_unreachable (void); -++ ecb_inline void ecb_noreturn ecb_unreachable (void) { } -+ #endif -+ -+ /* try to tell the compiler that some condition is definitely true */ +--- ext/libev/ev.c.orig 2015-05-06 14:19:50 UTC ++++ ext/libev/ev.c +@@ -967,12 +967,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 void ecb_noreturn ecb_unreachable (void); ++ ecb_inline void ecb_noreturn ecb_unreachable (void) { } + #endif + + /* try to tell the compiler that some condition is definitely true */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505061440.t46Ee4dZ031971>