From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/4] ci/deps: drop unnecessary mappings and add Inline
Date: Fri, 8 Sep 2023 13:09:07 +0000 [thread overview]
Message-ID: <20230908130908.2263772-4-e@80x24.org> (raw)
In-Reply-To: <20230908130908.2263772-1-e@80x24.org>
The automatic mapping can work for more packages, so redundant
entries in $non_auto are just clutter.
Unfortunately, `Inline::C' is part of `Inline' on CentOS 7.x and
OpenBSD 7.3, so we'll add $non_auto mappings for those.
We'll also depend on `IO::Compress' to simplify mappings since
that's the CPAN distribution which holds both IO::Compress::Gzip
and IO::Compress::Gunzip and I'm not aware of any packagers who
split them.
---
ci/deps.perl | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/ci/deps.perl b/ci/deps.perl
index 119ef07f..e7d43cd9 100755
--- a/ci/deps.perl
+++ b/ci/deps.perl
@@ -11,7 +11,9 @@ my $pkg_fmt = shift;
my @test_essential = qw(Test::Simple); # we actually use Test::More
-# package profiles
+# package profiles. Note we specify packages at maximum granularity,
+# which is typically deb for most things, but rpm seems to have the
+# highest granularity for things in the Prl standard library.
my $profiles = {
# the smallest possible profile for testing
essential => [ qw(
@@ -20,7 +22,7 @@ my $profiles = {
Digest::SHA
Encode
ExtUtils::MakeMaker
- IO::Compress::Gzip
+ IO::Compress
URI
), @test_essential ],
@@ -55,7 +57,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);
} elsif ($pkg_fmt eq 'rpm') {
@precious = qw(perl curl);
}
@@ -87,33 +89,26 @@ my $non_auto = {
'Encode' => {
deb => 'perl', # libperl5.XX, but the XX varies
pkg => 'perl5',
- rpm => 'perl-Encode',
},
'ExtUtils::MakeMaker' => {
deb => 'perl', # perl-modules-5.xx
pkg => 'perl5',
- rpm => 'perl-ExtUtils-MakeMaker',
},
- 'IO::Compress::Gzip' => {
+ 'IO::Compress' => {
deb => 'perl', # perl-modules-5.xx
pkg => 'perl5',
- rpm => 'perl-IO-Compress',
+ },
+ 'Inline::C' => {
+ rpm => 'perl-Inline', # for CentOS 7.x, at least
},
'DBD::SQLite' => { deb => 'libdbd-sqlite3-perl' },
'Plack::Test' => {
deb => 'libplack-perl',
pkg => 'p5-Plack',
- rpm => 'perl-Plack-Test',
- },
- 'URI' => {
- deb => 'liburi-perl',
- pkg => 'p5-URI',
- rpm => 'perl-URI',
},
'Test::Simple' => {
deb => 'perl', # perl-modules-5.XX, but the XX varies
pkg => 'perl5',
- rpm => 'perl-Test-Simple',
},
'highlight.pm' => {
deb => 'libhighlight-perl',
@@ -131,7 +126,6 @@ my $non_auto = {
# OS-specific
'IO::KQueue' => {
deb => [],
- pkg => 'p5-IO-KQueue',
rpm => [],
},
};
next prev parent reply other threads:[~2023-09-08 13:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 13:09 [PATCH 0/4] doc and ci scripts updates Eric Wong
2023-09-08 13:09 ` [PATCH 1/4] update docs + tests for xapian-delve use Eric Wong
2023-09-08 13:09 ` [PATCH 2/4] ci/deps: add IMAP-related optional packages Eric Wong
2023-09-08 13:09 ` Eric Wong [this message]
2023-09-08 13:09 ` [PATCH 4/4] ci: updates for OpenBSD Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230908130908.2263772-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).