<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/43c38ee26a1760eae0dabf07a445f15d989193eb">https://github.com/macports/macports-ports/commit/43c38ee26a1760eae0dabf07a445f15d989193eb</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 43c38ee perl5.24: backport a patch to allow testing
</span>43c38ee is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 43c38ee26a1760eae0dabf07a445f15d989193eb
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Dec 31 09:38:47 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> perl5.24: backport a patch to allow testing
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55203
</span>---
lang/perl5/Portfile | 10 +-
.../5.24/adjust-dependency-paths-PR126706.patch | 136 +++++++++++++++++++++
2 files changed, 142 insertions(+), 4 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 2152161..dac09f4 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;'>@@ -99,15 +99,17 @@ 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:#e0ffe0;'>+ if {${perl5.major} >= 5.24} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix library path (backported)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://rt.perl.org/Public/Bug/Display.html?id=126706
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${perl5.major}/adjust-dependency-paths-PR126706.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
patchfiles-append \
${perl5.major}/enable-syscall-on-sierra.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix library path (backported)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://rt.perl.org/Public/Bug/Display.html?id=126706
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${perl5.major}/adjust-dependency-paths-PR126706.patch
</span> }
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/files/5.24/adjust-dependency-paths-PR126706.patch b/lang/perl5/files/5.24/adjust-dependency-paths-PR126706.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cf26298
</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.24/adjust-dependency-paths-PR126706.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,136 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Perl/perl5/commit/191f8909fa4eca1db16a91ada42dd4a065c04890.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 191f8909fa4eca1db16a91ada42dd4a065c04890 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tony Cook <tony@develop-help.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 4 Oct 2018 14:41:03 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] (perl #127606) adjust dependency paths on installation on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SIP (System Integrity Protection) on OS X prevents the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+DYLD_LIBRARY_PATH environment variable from being propagated through
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/bin/sh, causes many tests to fail (and some more recent build issues)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for -Duseshrplib builds.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To avoid that, we change the way libperl.dylib is linked to perl, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for the initial build the library's id is at the build location rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+than the install location, and the generated executable also expects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to find libperl in that location.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This obviously won't work once we copy both to the installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+directory, so we adjust both the id of the library and the dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+path in the executable to point to the new location of the library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A previous attempt set -rpath and used @rpath in the id, but this made
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the embedding test fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.SH | 34 ++++++++++++++++++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installperl | 25 +++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 57 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Makefile.SH Makefile.SH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e4d5ee684f..bebe50dc131 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.SH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.SH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,8 +67,16 @@ true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -compatibility_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${api_revision}.${api_version}.${api_subversion} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -current_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${revision}.${patchlevel}.${subversion} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -install_name \$(shrpdir)/\$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${revision}.${patchlevel}.${subversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$osvers" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 1[5-9]*|[2-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ shrpldflags="$shrpldflags -install_name `pwd`/\$@ -Xlinker -headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exeldflags="-Xlinker -headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ shrpldflags="$shrpldflags -install_name \$(shrpdir)/\$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cygwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,6 +341,14 @@ MANIFEST_SRT = MANIFEST.srt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !GROK!THIS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "$useshrplib$osname" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++truedarwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $spitshell >>$Makefile <<!GROK!THIS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PERL_EXE_LDFLAGS=$exeldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++!GROK!THIS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$usecrosscompile$perl" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ define?*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $spitshell >>$Makefile <<!GROK!THIS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1010,6 +1026,20 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !NO!SUBS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$useshrplib$osvers" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ true1[5-9]*|true[2-9]*) $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(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:#e0ffe0;'>++!NO!SUBS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++!NO!SUBS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *) $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !NO!SUBS!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git installperl installperl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3bf79d2d6fc..6cd65a09238 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- installperl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ installperl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,6 +304,7 @@ elsif ($^O ne 'dos') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip("$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fix_dep_names("$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -388,6 +389,7 @@ foreach my $file (@corefiles) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fix_dep_names("$installarchlib/CORE/$file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod($SO_MODE, "$installarchlib/CORE/$file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod($NON_SO_MODE, "$installarchlib/CORE/$file");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -834,4 +836,27 @@ sub strip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub fix_dep_names {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $file = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $^O eq "darwin" && $Config{osvers} =~ /^(1[5-9]|[2-9])/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && $Config{useshrplib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ or return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my @opts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $so = $Config{so};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $libperl = "$Config{archlibexp}/CORE/libperl.$Config{so}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($file =~ /\blibperl.\Q$Config{so}\E$/a) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ push @opts, -id => $libperl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ push @opts, -change => getcwd . "/libperl.$so", $libperl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ push @opts, $file;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $opts{verbose} and print " install_name_tool @opts\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ system "install_name_tool", @opts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ and die "Cannot update $file dependency paths\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ex: set ts=8 sts=4 sw=4 et:
</span></pre><pre style='margin:0'>
</pre>