<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26dcf67f5b33a443b278a9e5382f1a18dea32d32">https://github.com/macports/macports-ports/commit/26dcf67f5b33a443b278a9e5382f1a18dea32d32</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 26dcf67f5b3 perl5.26: avoid rebuilding DB_File in destroot
</span>26dcf67f5b3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26dcf67f5b33a443b278a9e5382f1a18dea32d32
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 28 19:56:59 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> perl5.26: avoid rebuilding DB_File in destroot
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Applying upstream fix that is present in 5.28+
</span>---
lang/perl5/Portfile | 5 ++++
lang/perl5/files/5.26/make_ext.pl-version.patch | 33 +++++++++++++++++++++++++
2 files changed, 38 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/Portfile b/lang/perl5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5bf8b8567c2..1e35bcdd18b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/perl5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/perl5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,6 +122,11 @@ foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256 perl5
</span> patchfiles-append \
${perl5.major}/adjust-dependency-paths-PR126706.patch
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${perl5.major} == 5.26} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid rebuilding DB_File in the destroot phase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${perl5.major}/make_ext.pl-version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {${perl5.major} >= 5.26} {
# enable syscall() on Sierra for compatibility with earlier OS versions and perl5.24
# Apple has deprecated syscall() on Sierra but it is still available
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/files/5.26/make_ext.pl-version.patch b/lang/perl5/files/5.26/make_ext.pl-version.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0c2a6a5b632
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/perl5/files/5.26/make_ext.pl-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 301bcfdaa73a979264d6ee1845c40043ddd464eb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Father Chrysostomos <sprout@cpan.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 30 Oct 2017 13:37:21 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] make_ext.pl: Use version.pm for version cmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We do a version comparison to determine whether Makefile.PL needs to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+be run (in case a module version changed). The simple string compar-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ison we have done up till now fails if the two version numbers differ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+simply by a trailing zero (as currently happens with DB_File, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is at version 1.840, with XS_VERSION set to 1.84. Since version.pm’s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+routines are compiled into miniperl, there is no reason not to do this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+‘properly’, and it stops multiple ‘make’ invocations from rebuilding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+DB_File again, and again....
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_ext.pl | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git make_ext.pl.orig make_ext.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 80d8f68aa318..9bc4718d52d4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make_ext.pl.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make_ext.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,7 +303,7 @@ sub build_extension {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ last unless defined $oldv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require ExtUtils::MM_Unix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined (my $newv = parse_version MM $vmod) or last;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ($newv ne $oldv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (version->parse($newv) ne $oldv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $mfh or die "close $makefile: $!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _unlink($makefile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>