<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e50cc655023ba204783e8963ead3fcc662dcae50">https://github.com/macports/macports-ports/commit/e50cc655023ba204783e8963ead3fcc662dcae50</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 e50cc655023 gawk: use upstream patch to univerally disable PMA under darwin
</span>e50cc655023 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e50cc655023ba204783e8963ead3fcc662dcae50
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Tue Nov 29 11:01:24 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> gawk: use upstream patch to univerally disable PMA under darwin
</span>---
lang/gawk/Portfile | 22 +------
lang/gawk/files/patch-pma.diff | 139 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 142 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gawk/Portfile b/lang/gawk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8aedc947fb5..2ff31918e0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gawk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gawk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup legacysupport 1.1
</span>
name gawk
version 5.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories lang
license GPL-3+
installs_libs no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,24 +35,8 @@ configure.args --with-libiconv-prefix=${prefix} \
</span> ac_cv_prog_AWK=awk
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ne "x86_64" || ${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See README_d/README.macosx: PMA (persistent memory allocator) requires
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # non-PIE (position-independent executable), but this is impossible on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mac-arm64, and deprecated when targeting macOS 12 and later. Disable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the PMA feature in those cases.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Also affects PPC: https://trac.macports.org/ticket/66329
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pma
</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;'>- if {${build_arch} eq "arm64" || ${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant pma description {Add PMA support, requires Rosetta on arm64} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pma
</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:#e0ffe0;'>+ # upstream patch for PMA issue (ppc64, arm64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-pma.diff
</span>
# https://trac.macports.org/ticket/65944
if {${os.major} < 10} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gawk/files/patch-pma.diff b/lang/gawk/files/patch-pma.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..64b6549f419
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gawk/files/patch-pma.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,139 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git README_d/ChangeLog README_d/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3289dfd9..61b517d2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- README_d/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ README_d/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2022-11-27 Arnold D. Robbins <arnold@skeeve.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * README.macosx: Updated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2022-11-17 Arnold D. Robbins <arnold@skeeve.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * 5.2.1: Release tar ball made.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git README_d/README.macosx README_d/README.macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 741cf4da..256a7de2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- README_d/README.macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ README_d/README.macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Sun 27 Nov 2022 14:54:06 EST
</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;'>++Building an x86_64 binary on M1 systems was a bad idea. Not all systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++have Rosetta installed, and there are still ppc and ppc64 systems out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++in the world. See https://trac.macports.org/ticket/66329.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++So for now, PMA in enabled for macOS only on x86_64.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Sun 23 Oct 2022 14:24:37 IDT
</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;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 84024e9d..b7020b38 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12618,15 +12618,18 @@ else $as_nop
</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;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 23 October 2022: See README_d/README.macosx for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the details on what's happening here. See also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the manual.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Compile as Intel binary all the time, even on M1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export CFLAGS LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # 27 November 2022: PMA only works on Intel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x86_64-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export LDFLAGS
</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;'>++ # disable on all other macOS systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_persistent_malloc=no
</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* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ true # nothing do, exes on these systems are not PIE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git extension/configure extension/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f6c9394b..6e28f0db 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extension/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extension/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8832,15 +8832,18 @@ else $as_nop
</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;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # 23 October 2022: See README_d/README.macosx for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the details on what's happening here. See also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the manual.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Compile as Intel binary all the time, even on M1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export CFLAGS LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # 27 November 2022: PMA only works on Intel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x86_64-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export LDFLAGS
</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;'>++ # disable on all other macOS systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_persistent_malloc=no
</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* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ true # nothing do, exes on these systems are not PIE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git m4/ChangeLog m4/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e2b52353..fb13cf09 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/ChangeLog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2022-11-27 Arnold D. Robbins <arnold@skeeve.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * pma.m4: Don't build an x86 binary on non-x86 macOS systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ See https://trac.macports.org/ticket/66329. Thanks to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Marius Schamschula <lists@schamschula.com> for the report.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2022-11-17 Arnold D. Robbins <arnold@skeeve.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * 5.2.1: Release tar ball made.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git m4/pma.m4 m4/pma.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00f29722..c0535a26 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/pma.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/pma.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,15 +23,18 @@ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [LDFLAGS="${LDFLAGS} -no-pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export LDFLAGS])
</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;'>+- # 23 October 2022: See README_d/README.macosx for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the details on what's happening here. See also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the manual.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Compile as Intel binary all the time, even on M1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export CFLAGS LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # 27 November 2022: PMA only works on Intel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x86_64-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export LDFLAGS
</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;'>++ # disable on all other macOS systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ use_persistent_malloc=no
</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* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ true # nothing do, exes on these systems are not PIE
</span></pre><pre style='margin:0'>
</pre>