[PATCH 0/2] minimal system fixes

[PATCH 0/2] minimal system fixes

[Eric Wong]

Eric Wong (2):
  Makefile.pl: *.cols: account for non-UTF-8-aware awk
  clone: allow running without DBI / DBD::SQLite

 Makefile.PL                 | 2 +-
 lib/PublicInbox/LeiQuery.pm | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

[PATCH 1/2] Makefile.pl: *.cols: account for non-UTF-8-aware awk

[Eric Wong]

When checking line length limits, the `length()' function of
mawk doesn't count non-ASCII characters properly in UTF-8
locales.  Force the man(1) output to use C locale and use normal
`-' instead of multi-byte dash characters.
---
 Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.PL b/Makefile.PL
index 579245a1..710d705d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -81,7 +81,7 @@ for my $i (@sections) {
 		$t->{"Documentation/$m.html : $txt"} = [ "\$(txt2pre) <$txt",
 							"touch -r $txt \$@" ];
 		$t->{".$m.cols : $m.$i"} = [
-			"\@echo CHECK80 $m.$i;".
+			"\@echo CHECK80 $m.$i; LC_ALL=C LANG=C ".
 			"COLUMNS=80 \$(MAN) ./$m.$i | \$(check_man)",
 			'>$@' ];
 		$t->{".$m.lexgrog: $m.$i"} = [

[PATCH 2/2] clone: allow running without DBI / DBD::SQLite

[Eric Wong]

Due to historic reasons, LeiQuery.pm gets loaded with LEI.pm and
-clone depends on LEI.  So delay loading any DBI-dependent
modules until querying is actually required.
---
 lib/PublicInbox/LeiQuery.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 3337e5d4..26cfb3fd 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -4,9 +4,7 @@
 # handles "lei q" command and provides internals for
 # several other sub-commands (up, lcat, ...)
 package PublicInbox::LeiQuery;
-use strict;
-use v5.10.1;
-use PublicInbox::OverIdx;
+use v5.12;
 
 sub prep_ext { # externals_each callback
 	my ($lxs, $exclude, $loc) = @_;
@@ -18,6 +16,7 @@ sub _start_query { # used by "lei q" and "lei up"
 	require PublicInbox::LeiOverview;
 	PublicInbox::LeiOverview->new($self) or return;
 	my $opt = $self->{opt};
+	require PublicInbox::OverIdx; # loads DBI
 	PublicInbox::OverIdx::fork_ok($opt);
 	my ($xj, $mj) = split(/,/, $opt->{jobs} // '');
 	(defined($xj) && $xj ne '' && $xj !~ /\A[1-9][0-9]*\z/) and