<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7e47a1abc271522e4856f3415d5e22cae66a5b3">https://github.com/macports/macports-ports/commit/e7e47a1abc271522e4856f3415d5e22cae66a5b3</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 e7e47a1 perl5.28: update to 5.28.2
</span>e7e47a1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7e47a1abc271522e4856f3415d5e22cae66a5b3
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Apr 21 14:32:29 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> perl5.28: update to 5.28.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58363
</span>---
lang/perl5/Portfile | 4 +-
.../5.28/adjust-dependency-paths-PR126706.patch | 136 ---------------------
.../files/5.28/fix-miniperl-linking-PR36438.patch | 2 +-
3 files changed, 3 insertions(+), 139 deletions(-)
<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 751698e..4e62fb7 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;'>@@ -29,7 +29,7 @@ set perl5.versions_info {
</span> 5.22 4 3 54fdbcbf249134dc7d82b693417900286201b5e7 8b3122046d1186598082d0e6da53193b045e85e3505e7d37ee0bdd0bdb539b71 13745983
5.24 4 2 8d6b67fc6d58334b2fdbfa9d6d7456265dca1f4e e34ff38c54857f431f37403b757267c9998152bf46b5c750b462f62461279b10 14125130
5.26 3 2 84ed404407c198ca2b8194c374c7914d941b6f49 9ff35a613213f29ab53975141af6825ae7d4408895538cac0922e47ab92a1477 14539342
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.28 1 1 e2f0618fc01bcd253ef6e003c1d9b957b6f6aa53 fea7162d4cca940a387f0587b93f6737d884bf74d8a9d7cfd978bc12cd0b202d 12372080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.28 2 0 8ec4c3a3fa2df12c47cf3e9613dc215333f3d042 0b0189bfa4b2da20e899b4bdd746ac402e8f746a58e4fcf5516484157f2aab07 12374448
</span> }
foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256 perl5.size} ${perl5.versions_info} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256 perl5
</span> patchfiles-append \
${perl5.major}/remove-10.3-target-PR126360.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${perl5.major} >= 5.24} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${perl5.major} >= 5.24 && ${perl5.major} < 5.28} {
</span> # Fix library path (backported)
# https://rt.perl.org/Public/Bug/Display.html?id=126706
patchfiles-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/files/5.28/adjust-dependency-paths-PR126706.patch b/lang/perl5/files/5.28/adjust-dependency-paths-PR126706.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index afc6a30..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/perl5/files/5.28/adjust-dependency-paths-PR126706.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,136 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Perl/perl5/commit/191f8909fa4eca1db16a91ada42dd4a065c04890.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 191f8909fa4eca1db16a91ada42dd4a065c04890 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tony Cook <tony@develop-help.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 4 Oct 2018 14:41:03 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] (perl #127606) adjust dependency paths on installation on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SIP (System Integrity Protection) on OS X prevents the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DYLD_LIBRARY_PATH environment variable from being propagated through
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/bin/sh, causes many tests to fail (and some more recent build issues)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for -Duseshrplib builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To avoid that, we change the way libperl.dylib is linked to perl, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for the initial build the library's id is at the build location rather
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-than the install location, and the generated executable also expects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to find libperl in that location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This obviously won't work once we copy both to the installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-directory, so we adjust both the id of the library and the dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-path in the executable to point to the new location of the library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-A previous attempt set -rpath and used @rpath in the id, but this made
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the embedding test fail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile.SH | 34 ++++++++++++++++++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installperl | 25 +++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 57 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makefile.SH Makefile.SH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6e4d5ee684f..bebe50dc131 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.SH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.SH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,8 +67,16 @@ true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -compatibility_version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${api_revision}.${api_version}.${api_subversion} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -current_version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${revision}.${patchlevel}.${subversion} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -install_name \$(shrpdir)/\$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${revision}.${patchlevel}.${subversion}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case "$osvers" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 1[5-9]*|[2-9]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shrpldflags="$shrpldflags -install_name `pwd`/\$@ -Xlinker -headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exeldflags="-Xlinker -headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shrpldflags="$shrpldflags -install_name \$(shrpdir)/\$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cygwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,6 +347,14 @@ MANIFEST_SRT = MANIFEST.srt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !GROK!THIS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+case "$useshrplib$osname" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+truedarwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $spitshell >>$Makefile <<!GROK!THIS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PERL_EXE_LDFLAGS=$exeldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!GROK!THIS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$usecrosscompile$perl" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- define?*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $spitshell >>$Makefile <<!GROK!THIS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1050,6 +1066,20 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !NO!SUBS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case "$useshrplib$osvers" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ true1[5-9]*|true[2-9]*) $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(SHRPENV) $(CC) -o perl $(PERL_EXE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!NO!SUBS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *) $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!NO!SUBS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !NO!SUBS!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git installperl installperl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3bf79d2d6fc..6cd65a09238 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- installperl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ installperl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,6 +304,7 @@ elsif ($^O ne 'dos') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strip("$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fix_dep_names("$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -388,6 +389,7 @@ foreach my $file (@corefiles) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fix_dep_names("$installarchlib/CORE/$file");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod($SO_MODE, "$installarchlib/CORE/$file");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod($NON_SO_MODE, "$installarchlib/CORE/$file");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -791,4 +793,27 @@ sub strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sub fix_dep_names {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $file = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $^O eq "darwin" && $Config{osvers} =~ /^(1[5-9]|[2-9])/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && $Config{useshrplib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ or return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my @opts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $so = $Config{so};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $libperl = "$Config{archlibexp}/CORE/libperl.$Config{so}";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($file =~ /\blibperl.\Q$Config{so}\E$/a) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push @opts, -id => $libperl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push @opts, -change => getcwd . "/libperl.$so", $libperl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ push @opts, $file;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $opts{verbose} and print " install_name_tool @opts\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system "install_name_tool", @opts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ and die "Cannot update $file dependency paths\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ex: set ts=8 sts=4 sw=4 et:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/files/5.28/fix-miniperl-linking-PR36438.patch b/lang/perl5/files/5.28/fix-miniperl-linking-PR36438.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 50d4484..e3df623 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/perl5/files/5.28/fix-miniperl-linking-PR36438.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/perl5/files/5.28/fix-miniperl-linking-PR36438.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Makefile.SH.orig
+++ Makefile.SH
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1004,7 +1004,7 @@ NAMESPACEFLAGS = -force_flat_namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1020,7 +1020,7 @@ NAMESPACEFLAGS = -force_flat_namespace
</span> $spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
-@rm -f miniperl.xok
</pre><pre style='margin:0'>
</pre>