* [PATCH 06/10] gcf2: simplify pkg-config and Inline::C setup
2023-10-27 22:21 6% [PATCH 00/10] first steps towards eliminating TIEHANDLE Eric Wong
@ 2023-10-27 22:21 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-10-27 22:21 UTC (permalink / raw)
To: meta
We can use run_qx and try_cat to make the build setup simpler.
---
lib/PublicInbox/Gcf2.pm | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/lib/PublicInbox/Gcf2.pm b/lib/PublicInbox/Gcf2.pm
index 4f163cde..502bf33a 100644
--- a/lib/PublicInbox/Gcf2.pm
+++ b/lib/PublicInbox/Gcf2.pm
@@ -5,11 +5,11 @@
# other libgit2 stuff may go here, too.
package PublicInbox::Gcf2;
use v5.12;
-use PublicInbox::Spawn qw(which popen_rd); # may set PERL_INLINE_DIRECTORY
+use PublicInbox::Spawn qw(which run_qx); # may set PERL_INLINE_DIRECTORY
use Fcntl qw(SEEK_SET);
use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use IO::Handle; # autoflush
-use PublicInbox::Git qw(read_all);
+use PublicInbox::Git;
use PublicInbox::Lock;
BEGIN {
@@ -27,29 +27,16 @@ BEGIN {
my $pc = which($ENV{PKG_CONFIG} // 'pkg-config') //
die "pkg-config missing for libgit2";
my ($dir) = (__FILE__ =~ m!\A(.+?)/[^/]+\z!);
- open my $err, '+>', "$inline_dir/.public-inbox.pkg-config.err";
my $vals = {};
- my $rdr = { 2 => $err };
+ my $rdr = { 2 => \(my $err) };
my @switches = qw(modversion cflags libs);
for my $k (@switches) {
- my $rd = popen_rd([$pc, "--$k", 'libgit2'], undef, $rdr);
- chomp(my $val = do { local $/; <$rd> });
- CORE::close($rd) or last; # checks for error and sets $?
+ chomp(my $val = run_qx([$pc, "--$k", 'libgit2'], undef, $rdr));
+ die "E: libgit2 not installed: $err\n" if $?;
$vals->{$k} = $val;
}
- if (!$?) {
- # note: we name C source files .h to prevent
- # ExtUtils::MakeMaker from automatically trying to
- # build them.
- my $f = "$dir/gcf2_libgit2.h";
- open my $src, '<', $f;
- $c_src = read_all($src);
- }
- unless ($c_src) {
- seek($err, 0, SEEK_SET);
- $err = read_all($err);
- die "E: libgit2 not installed: $err\n";
- }
+ my $f = "$dir/gcf2_libgit2.h";
+ $c_src = PublicInbox::Git::try_cat($f) or die "cat $f: $!";
# append pkg-config results to the source to ensure Inline::C
# can rebuild if there's changes (it doesn't seem to detect
# $CFG{CCFLAGSEX} nor $CFG{CPPFLAGS} changes)
^ permalink raw reply related [relevance 7%]
* [PATCH 00/10] first steps towards eliminating TIEHANDLE
@ 2023-10-27 22:21 6% Eric Wong
2023-10-27 22:21 7% ` [PATCH 06/10] gcf2: simplify pkg-config and Inline::C setup Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-10-27 22:21 UTC (permalink / raw)
To: meta
ProcessIO being tied is problematic since perlops like stat
and fcntl don't work directly on the handle, and we need
separate classes to do buffered read and unbuffered sysread.
It's possible to do as common packages (e.g. File::Temp,
IO::Socket::IP, IO::Socket::SSL) do by subclassing IO::Handle
to avoid tie completely. I also want to avoid the self-tie
thing IO::Socket::SSL to avoid having to rely on weaken().
So, this essentially becomes a war on `close($fh)' an relying
on $fh->close where appropriate. This loses some usefulness
of autodie, so we keep `close($fh)' for places which aren't
tied at the moment.
One key place is to replace many calls to popen_rd with the new
run_qx to consolidate close calls. There's also few other
cleanups, code reductions, and safety improvements along the way.
And more changes coming.
Eric Wong (10):
spawn: croak directly in C pi_fork_exec
spawnpp: use autodie for syscall failures
spawn: avoid alloca in C pi_fork_exec
git: use run_qx to read `git --version'
git: avoid extra stat(2) for git version
gcf2: simplify pkg-config and Inline::C setup
treewide: use run_qx where appropriate
www_altid: reduce FD pressure in qspawn queues
xt/eml_check_limits: remove useless import
lei_ale: use v5.12, autodie, and try_cat
lib/PublicInbox/Admin.pm | 7 ++---
lib/PublicInbox/Config.pm | 14 ++++-----
lib/PublicInbox/Fetch.pm | 7 ++---
lib/PublicInbox/Gcf2.pm | 27 +++++-----------
lib/PublicInbox/Git.pm | 15 +++++----
lib/PublicInbox/Import.pm | 6 ++--
lib/PublicInbox/LEI.pm | 7 ++---
lib/PublicInbox/LeiALE.pm | 24 +++++++--------
lib/PublicInbox/LeiBlob.pm | 12 +++-----
lib/PublicInbox/LeiMirror.pm | 7 ++---
lib/PublicInbox/MultiGit.pm | 7 ++---
lib/PublicInbox/Spamcheck/Spamc.pm | 11 ++-----
lib/PublicInbox/Spawn.pm | 49 +++++++++++++++---------------
lib/PublicInbox/SpawnPP.pm | 10 +++---
lib/PublicInbox/WwwAltId.pm | 9 ++----
lib/PublicInbox/XapHelperCxx.pm | 11 ++-----
t/solver_git.t | 12 +++-----
xt/eml_check_limits.t | 4 +--
18 files changed, 94 insertions(+), 145 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-10-27 22:21 6% [PATCH 00/10] first steps towards eliminating TIEHANDLE Eric Wong
2023-10-27 22:21 7% ` [PATCH 06/10] gcf2: simplify pkg-config and Inline::C setup 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).