<pre style='margin:0'>
ghosthound pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9587791e43977ed408021567ff0baaceec4cafe6">https://github.com/macports/macports-ports/commit/9587791e43977ed408021567ff0baaceec4cafe6</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 9587791e439 lang/perl5: add patch from perl 5.32 that lets perl5 build on macOS 11.3.x/Xcode 12.5. Also tested on macOS 10.15.7. resolves https://trac.macports.org/ticket/62779
</span>9587791e439 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9587791e43977ed408021567ff0baaceec4cafe6
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Sat May 22 10:51:32 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> lang/perl5: add patch from perl 5.32 that lets perl5 build on macOS 11.3.x/Xcode 12.5.
</span><span style='display:block; white-space:pre;color:#404040;'> Also tested on macOS 10.15.7.
</span><span style='display:block; white-space:pre;color:#404040;'> resolves https://trac.macports.org/ticket/62779
</span>---
lang/perl5/Portfile | 24 ++++++---
lang/perl5/files/5.28/patch-hints-darwin_sh.diff | 57 +++++++++++++++++++++
lang/perl5/files/5.30/patch-hints-darwin_sh.diff | 65 ++++++++++++++++++++++++
3 files changed, 140 insertions(+), 6 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 04525a969d9..4463a9de985 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;'>@@ -140,6 +140,12 @@ foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256 perl5
</span> ${perl5.major}/dont-write-invalid-write_buildcustomize.pl.patch \
${perl5.major}/fallback-to-built-in-getcwd.patch \
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${perl5.major} >= 5.28 && ${perl5.major} <= 5.30} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## backport the fix for "macOS 11.x" that went into 5.32.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## see https://github.com/Perl/perl5/pull/17946
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${perl5.major}/patch-hints-darwin_sh.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
reinplace -W ${worksrcpath} "s|__PREFIX__|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,12 +186,18 @@ foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256 perl5
</span> {-Alddlflags="$LDFLAGS"} \
{-Aldflags="$LDFLAGS"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Workaround buggy configure scripts that expect 10.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${macosx_deployment_target} 11.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macosx_deployment_target 10.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append SYSTEM_VERSION_COMPAT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## perl5.28 and 5.30 will compile on macOS 11.3 / Xcode 12.5 with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## the above patch-hints-darwin_sh.diff, and perl5.32(.1) has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## the fix in that patch included. So only use the below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## work-around for "buggy configure scripts" for perl < 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${perl5.major} < 5.28} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Workaround buggy configure scripts that expect 10.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${macosx_deployment_target} 11.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_deployment_target 10.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append SYSTEM_VERSION_COMPAT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/files/5.28/patch-hints-darwin_sh.diff b/lang/perl5/files/5.28/patch-hints-darwin_sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..08986cdb908
</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.28/patch-hints-darwin_sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,57 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hints/darwin.sh.orig 2021-04-30 11:34:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hints/darwin.sh 2021-04-30 11:39:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,7 +301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # capturing its value and adding it to the flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$MACOSX_DEPLOYMENT_TARGET" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [1-9][0-9].*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*** Please either set it to 10.something, or to empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +327,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "ProductVersion: 10.11" "10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$prodvers" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [1-9][0-9].*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ccflags $prodvers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ldflags $prodvers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,14 +344,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The X in 10.X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin_major=$(echo $osvers|awk -F. '{print $1}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # macOS (10.12) deprecated syscall().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # but it's still available on both macOS 10.12 and 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # for compatibility with perl5.24 allow syscall() configuration on Sierra and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # will auto-configure without syscall() if and when it's actually removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if [ "$prodvers_minor" -ge 12 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # d_syscall='undef'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$darwin_major" -ge 16 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_syscall='undef'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$MACOSX_DEPLOYMENT_TARGET" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[6-9]|10.10|10.11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccflags="$ccflags -Werror=partial-availability -D_DARWIN_FEATURE_CLOCK_GETTIME=0"
</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;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/perl5/files/5.30/patch-hints-darwin_sh.diff b/lang/perl5/files/5.30/patch-hints-darwin_sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..899558266b7
</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.30/patch-hints-darwin_sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hints/darwin.sh.orig 2021-04-30 12:30:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hints/darwin.sh 2021-04-30 12:32:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,7 +301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # capturing its value and adding it to the flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$MACOSX_DEPLOYMENT_TARGET" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [1-9][0-9].*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +313,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ***
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*** Please either set it to 10.something, or to empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +327,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "ProductVersion: 10.11" "10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$prodvers" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [1-9][0-9].*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ccflags $prodvers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_macosx_version_min ldflags $prodvers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,22 +344,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The X in 10.X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin_major=$(echo $osvers|awk -F. '{print $1}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # macOS (10.12) deprecated syscall().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # but it's still available on both macOS 10.12 and 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # for compatibility with perl5.24 allow syscall() configuration on Sierra and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # will auto-configure without syscall() if and when it's actually removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if [ "$prodvers_minor" -ge 12 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # d_syscall='undef'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # case "$MACOSX_DEPLOYMENT_TARGET" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 10.[6-9]|10.10|10.11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # ccflags="$ccflags -Werror=partial-availability -D_DARWIN_FEATURE_CLOCK_GETTIME=0"
</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;'>+- # esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$darwin_major" -ge 16 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_syscall='undef'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$MACOSX_DEPLOYMENT_TARGET" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[6-9]|10.10|10.11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccflags="$ccflags -Werror=partial-availability -D_DARWIN_FEATURE_CLOCK_GETTIME=0"
</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;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span></pre><pre style='margin:0'>
</pre>