Received: by mail.netbsd.org (Postfix, from userid 605) id 6F83184D67; Tue, 8 Oct 2019 14:06:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E6CC084D5D for ; Tue, 8 Oct 2019 14:06:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 42uki2tnHYCJ for ; Tue, 8 Oct 2019 14:06:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 53D7B84D4C for ; Tue, 8 Oct 2019 14:06:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 45D89FBF4; Tue, 8 Oct 2019 14:06:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157054360361580" MIME-Version: 1.0 Date: Tue, 8 Oct 2019 14:06:43 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/devel/ruby-eventmachine To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20191008140643.45D89FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157054360361580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Tue Oct 8 14:06:43 UTC 2019 Modified Files: pkgsrc/devel/ruby-eventmachine: distinfo Added Files: pkgsrc/devel/ruby-eventmachine/patches: patch-ext_em.cpp Log Message: Fix build with recent EV_SET To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/ruby-eventmachine/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/ruby-eventmachine/patches/patch-ext_em.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157054360361580 Content-Disposition: inline Content-Length: 3287 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ruby-eventmachine/distinfo diff -u pkgsrc/devel/ruby-eventmachine/distinfo:1.20 pkgsrc/devel/ruby-eventmachine/distinfo:1.21 --- pkgsrc/devel/ruby-eventmachine/distinfo:1.20 Sun Sep 23 14:19:05 2018 +++ pkgsrc/devel/ruby-eventmachine/distinfo Tue Oct 8 14:06:42 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.20 2018/09/23 14:19:05 taca Exp $ +$NetBSD: distinfo,v 1.21 2019/10/08 14:06:42 ryoon Exp $ SHA1 (eventmachine-1.2.7.gem) = 7a5b2896e210fac9759c786ee4510f265f75b481 RMD160 (eventmachine-1.2.7.gem) = 5c2c8344ce60461787dbae8114ec884a162ac7e7 SHA512 (eventmachine-1.2.7.gem) = fdbcf9fc933e2414e70f8f48153e9ba6ed7a0029cdf49cdcb4ab72ab26683e727a36c099f017f20681f9c361179461743e501278ca9bd5612e693e26867cc516 Size (eventmachine-1.2.7.gem) = 247296 bytes +SHA1 (patch-ext_em.cpp) = 6538a9e289aa7a1ea048854e838c4f336e5db00b Added files: Index: pkgsrc/devel/ruby-eventmachine/patches/patch-ext_em.cpp diff -u /dev/null pkgsrc/devel/ruby-eventmachine/patches/patch-ext_em.cpp:1.1 --- /dev/null Tue Oct 8 14:06:43 2019 +++ pkgsrc/devel/ruby-eventmachine/patches/patch-ext_em.cpp Tue Oct 8 14:06:43 2019 @@ -0,0 +1,53 @@ +$NetBSD: patch-ext_em.cpp,v 1.1 2019/10/08 14:06:43 ryoon Exp $ + +* Fix build with recent NetBSD 9.99 + +--- ext/em.cpp.orig 2019-10-08 05:16:57.314742512 +0000 ++++ ext/em.cpp +@@ -20,6 +20,10 @@ See the file COPYING for complete licens + // THIS ENTIRE FILE WILL EVENTUALLY BE FOR UNIX BUILDS ONLY. + //#ifdef OS_UNIX + ++#if defined(__NetBSD__) ++#include ++#endif ++ + #include "project.h" + + /* The numer of max outstanding timers was once a const enum defined in em.h. +@@ -1507,7 +1511,7 @@ int EventMachine_t::DetachFD (EventableD + if (Poller == Poller_Kqueue) { + // remove any read/write events for this fd + struct kevent k; +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500 + EV_SET (&k, ed->GetSocket(), EVFILT_READ | EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t)ed); + #else + EV_SET (&k, ed->GetSocket(), EVFILT_READ | EVFILT_WRITE, EV_DELETE, 0, 0, ed); +@@ -1703,7 +1707,7 @@ void EventMachine_t::ArmKqueueWriter (Ev + if (!ed) + throw std::runtime_error ("added bad descriptor"); + struct kevent k; +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500 + EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, (intptr_t)ed); + #else + EV_SET (&k, ed->GetSocket(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, ed); +@@ -1731,7 +1735,7 @@ void EventMachine_t::ArmKqueueReader (Ev + if (!ed) + throw std::runtime_error ("added bad descriptor"); + struct kevent k; +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500 + EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, (intptr_t)ed); + #else + EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed); +@@ -1788,7 +1792,7 @@ void EventMachine_t::_AddNewDescriptors( + // INCOMPLETE. Some descriptors don't want to be readable. + assert (kqfd != -1); + struct kevent k; +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500 + EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, (intptr_t)ed); + #else + EV_SET (&k, ed->GetSocket(), EVFILT_READ, EV_ADD, 0, 0, ed); --_----------=_157054360361580--