From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6DBFA1F461 for ; Mon, 24 Jun 2019 02:59:24 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 50/57] ci: require IO::KQueue on FreeBSD, for now Date: Mon, 24 Jun 2019 02:52:51 +0000 Message-Id: <20190624025258.25592-51-e@80x24.org> In-Reply-To: <20190624025258.25592-1-e@80x24.org> References: <20190624025258.25592-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We'll likely replace IO::KQueue (at least on FreeBSD) using a pure-Perl syscall()-based version since syscall numbers are consistent across architectures on FreeBSD and easy to maintain. IO::KQueue->EV_SET is also shockingly inefficient in that it calls kqueue() as much as epoll_ctl. --- ci/deps.perl | 5 +---- ci/profiles.sh | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/deps.perl b/ci/deps.perl index 62870c1f..ad2c11d2 100755 --- a/ci/deps.perl +++ b/ci/deps.perl @@ -60,7 +60,7 @@ my $profiles = { # account for granularity differences between package systems and OSes my @precious; if ($^O eq 'freebsd') { - @precious = qw(perl curl Socket6 IO::Compress::Gzip); + @precious = qw(perl curl Socket6 IO::Compress::Gzip IO::KQueue); } elsif ($pkg_fmt eq 'rpm') { @precious = qw(perl curl); } @@ -149,9 +149,6 @@ my (@pkg_install, @pkg_remove, %all); for my $ary (values %$profiles) { $all{$_} = \@pkg_remove for @$ary; } -if ($^O eq 'freebsd') { - $all{'IO::KQueue'} = \@pkg_remove; -} $profiles->{all} = [ keys %all ]; # pseudo-profile for all packages # parse the profile list from the command-line diff --git a/ci/profiles.sh b/ci/profiles.sh index d559ec5f..1ddf7891 100755 --- a/ci/profiles.sh +++ b/ci/profiles.sh @@ -54,8 +54,7 @@ esac case $ID-$VERSION_ID in freebsd-11|freebsd-12) sed "s/^/$PKG_FMT /" <