* [PATCH 0/4] doc and ci scripts updates
@ 2023-09-08 13:09 7% Eric Wong
2023-09-08 13:09 6% ` [PATCH 3/4] ci/deps: drop unnecessary mappings and add Inline Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-09-08 13:09 UTC (permalink / raw)
To: meta
Hoping these can keep minimal, full, and in-between
installations working reasonably well on all platforms.
OpenBSD pkg_add support has started (not sure what to
call it to not conflict with FreeBSD `pkg')
ci/profiles.sh will probably be rewritten in Perl,
and NetBSD (`pkgin') updates will be coming, too.
Eric Wong (4):
update docs + tests for xapian-delve use
ci/deps: add IMAP-related optional packages
ci/deps: drop unnecessary mappings and add Inline
ci: updates for OpenBSD
Documentation/txt2pre | 2 +
INSTALL | 5 +-
ci/deps.perl | 119 +++++++++++++++++++++++++++---------------
ci/profiles.sh | 23 +++++++-
t/cindex.t | 14 +++--
5 files changed, 114 insertions(+), 49 deletions(-)
^ permalink raw reply [relevance 7%]
* [PATCH 3/4] ci/deps: drop unnecessary mappings and add Inline
2023-09-08 13:09 7% [PATCH 0/4] doc and ci scripts updates Eric Wong
@ 2023-09-08 13:09 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-09-08 13:09 UTC (permalink / raw)
To: meta
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 => [],
},
};
^ permalink raw reply related [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-09-08 13:09 7% [PATCH 0/4] doc and ci scripts updates Eric Wong
2023-09-08 13:09 6% ` [PATCH 3/4] ci/deps: drop unnecessary mappings and add Inline Eric Wong
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).