From owner-svn-ports-head@FreeBSD.ORG Wed May 6 14:40:04 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C34BB210; Wed, 6 May 2015 14:40:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9850D1EA2; Wed, 6 May 2015 14:40:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46Ee4t5031972; Wed, 6 May 2015 14:40:04 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46Ee4dZ031971; Wed, 6 May 2015 14:40:04 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201505061440.t46Ee4dZ031971@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 6 May 2015 14:40:04 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2015 14:40:04 -0000 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 */