From owner-svn-ports-head@freebsd.org Sat Jan 20 20:27:52 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2E50EC4E26; Sat, 20 Jan 2018 20:27:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CBE4E69F55; Sat, 20 Jan 2018 20:27:52 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5888213BF; Sat, 20 Jan 2018 20:27:51 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0KKRpaX000257; Sat, 20 Jan 2018 20:27:51 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0KKRpNN000256; Sat, 20 Jan 2018 20:27:51 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201801202027.w0KKRpNN000256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Jan 2018 20:27:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459550 - head/devel/rubygem-eventmachine/files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/devel/rubygem-eventmachine/files X-SVN-Commit-Revision: 459550 X-SVN-Commit-Repository: ports 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.25 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: Sat, 20 Jan 2018 20:27:53 -0000 Author: antoine Date: Sat Jan 20 20:27:51 2018 New Revision: 459550 URL: https://svnweb.freebsd.org/changeset/ports/459550 Log: Fix build with clang 6 em.cpp:1242:59: error: invalid operands to binary expression ('__bind' and 'int') if (bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 225304 Reported by: pkg-fallout Added: head/devel/rubygem-eventmachine/files/ head/devel/rubygem-eventmachine/files/patch-ext_em.cpp (contents, props changed) Added: head/devel/rubygem-eventmachine/files/patch-ext_em.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/rubygem-eventmachine/files/patch-ext_em.cpp Sat Jan 20 20:27:51 2018 (r459550) @@ -0,0 +1,47 @@ +--- ext/em.cpp.orig 2018-01-18 19:46:12 UTC ++++ ext/em.cpp +@@ -375,7 +375,7 @@ void EventMachine_t::_InitializeLoopBrea + for (i=0; i < 100; i++) { + int r = (rand() % 10000) + 20000; + LoopBreakerTarget.sin_port = htons (r); +- if (bind (sd, (struct sockaddr*)&LoopBreakerTarget, sizeof(LoopBreakerTarget)) == 0) ++ if (::bind (sd, (struct sockaddr*)&LoopBreakerTarget, sizeof(LoopBreakerTarget)) == 0) + break; + } + +@@ -1239,7 +1239,7 @@ const uintptr_t EventMachine_t::ConnectT + snprintf (buf, sizeof(buf)-1, "invalid bind address: %s", gai_strerror(gai)); + throw std::runtime_error (buf); + } +- if (bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) { ++ if (::bind (sd, (struct sockaddr *)&bind_to, bind_to_len) < 0) { + close (sd); + throw std::runtime_error ("couldn't bind to address"); + } +@@ -1620,7 +1620,7 @@ const uintptr_t EventMachine_t::CreateTc + } + + +- if (bind (sd_accept, (struct sockaddr *)&bind_here, bind_here_len)) { ++ if (::bind (sd_accept, (struct sockaddr *)&bind_here, bind_here_len)) { + //__warning ("binding failed"); + goto fail; + } +@@ -1667,7 +1667,7 @@ const uintptr_t EventMachine_t::OpenData + if (!SetSocketNonblocking (sd)) + goto fail; + +- if (bind (sd, (struct sockaddr *)&bind_here, bind_here_len) != 0) ++ if (::bind (sd, (struct sockaddr *)&bind_here, bind_here_len) != 0) + goto fail; + + { // Looking good. +@@ -1953,7 +1953,7 @@ const uintptr_t EventMachine_t::CreateUn + #endif + } + +- if (bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) { ++ if (::bind (sd_accept, (struct sockaddr*)&s_sun, sizeof(s_sun))) { + //__warning ("binding failed"); + goto fail; + }