[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-4968-ge0b77379
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-4968-ge0b77379 |
|
Date: |
Sun, 27 Nov 2022 15:04:48 -0500 (EST) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk-5.2-stable has been updated
via e0b7737930f8a677d3c509f8ce72b9130965ec0a (commit)
from 65eb8ec32368de455f56ed4d330f5010b119aba7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=e0b7737930f8a677d3c509f8ce72b9130965ec0a
commit e0b7737930f8a677d3c509f8ce72b9130965ec0a
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Sun Nov 27 15:04:26 2022 -0500
Don't build an x86_64 binary on macOS M1.
diff --git a/README_d/ChangeLog b/README_d/ChangeLog
index 3289dfd9..61b517d2 100644
--- a/README_d/ChangeLog
+++ b/README_d/ChangeLog
@@ -1,3 +1,7 @@
+2022-11-27 Arnold D. Robbins <arnold@skeeve.com>
+
+ * README.macosx: Updated.
+
2022-11-17 Arnold D. Robbins <arnold@skeeve.com>
* 5.2.1: Release tar ball made.
diff --git a/README_d/README.macosx b/README_d/README.macosx
index 741cf4da..256a7de2 100644
--- a/README_d/README.macosx
+++ b/README_d/README.macosx
@@ -1,3 +1,12 @@
+Sun 27 Nov 2022 14:54:06 EST
+============================
+
+Building an x86_64 binary on M1 systems was a bad idea. Not all systems
+have Rosetta installed, and there are still ppc and ppc64 systems out
+in the world. See https://trac.macports.org/ticket/66329.
+
+So for now, PMA in enabled for macOS only on x86_64.
+
Sun 23 Oct 2022 14:24:37 IDT
============================
diff --git a/configure b/configure
index 84024e9d..b7020b38 100755
--- a/configure
+++ b/configure
@@ -12618,15 +12618,18 @@ else $as_nop
fi
;;
- *darwin*)
- # 23 October 2022: See README_d/README.macosx for
- # the details on what's happening here. See also
- # the manual.
-
- # Compile as Intel binary all the time, even on M1.
- CFLAGS="${CFLAGS} -arch x86_64"
- LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
- export CFLAGS LDFLAGS
+ *darwin*)
+ # 27 November 2022: PMA only works on Intel.
+ case $host in
+ x86_64-*)
+ LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+ export LDFLAGS
+ ;;
+ *)
+ # disable on all other macOS systems
+ use_persistent_malloc=no
+ ;;
+ esac
;;
*cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
true # nothing do, exes on these systems are not PIE
diff --git a/extension/configure b/extension/configure
index f6c9394b..6e28f0db 100755
--- a/extension/configure
+++ b/extension/configure
@@ -8832,15 +8832,18 @@ else $as_nop
fi
;;
- *darwin*)
- # 23 October 2022: See README_d/README.macosx for
- # the details on what's happening here. See also
- # the manual.
-
- # Compile as Intel binary all the time, even on M1.
- CFLAGS="${CFLAGS} -arch x86_64"
- LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
- export CFLAGS LDFLAGS
+ *darwin*)
+ # 27 November 2022: PMA only works on Intel.
+ case $host in
+ x86_64-*)
+ LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+ export LDFLAGS
+ ;;
+ *)
+ # disable on all other macOS systems
+ use_persistent_malloc=no
+ ;;
+ esac
;;
*cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
true # nothing do, exes on these systems are not PIE
diff --git a/m4/ChangeLog b/m4/ChangeLog
index e2b52353..fb13cf09 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-27 Arnold D. Robbins <arnold@skeeve.com>
+
+ * pma.m4: Don't build an x86 binary on non-x86 macOS systems.
+ See https://trac.macports.org/ticket/66329. Thanks to
+ Marius Schamschula <lists@schamschula.com> for the report.
+
2022-11-17 Arnold D. Robbins <arnold@skeeve.com>
* 5.2.1: Release tar ball made.
diff --git a/m4/pma.m4 b/m4/pma.m4
index 00f29722..c0535a26 100644
--- a/m4/pma.m4
+++ b/m4/pma.m4
@@ -23,15 +23,18 @@ then
[LDFLAGS="${LDFLAGS} -no-pie"
export LDFLAGS])
;;
- *darwin*)
- # 23 October 2022: See README_d/README.macosx for
- # the details on what's happening here. See also
- # the manual.
-
- # Compile as Intel binary all the time, even on M1.
- CFLAGS="${CFLAGS} -arch x86_64"
- LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
- export CFLAGS LDFLAGS
+ *darwin*)
+ # 27 November 2022: PMA only works on Intel.
+ case $host in
+ x86_64-*)
+ LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+ export LDFLAGS
+ ;;
+ *)
+ # disable on all other macOS systems
+ use_persistent_malloc=no
+ ;;
+ esac
;;
*cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
true # nothing do, exes on these systems are not PIE
-----------------------------------------------------------------------
Summary of changes:
README_d/ChangeLog | 4 ++++
README_d/README.macosx | 9 +++++++++
configure | 21 ++++++++++++---------
extension/configure | 21 ++++++++++++---------
m4/ChangeLog | 6 ++++++
m4/pma.m4 | 21 ++++++++++++---------
6 files changed, 55 insertions(+), 27 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, gawk-5.2-stable, updated. gawk-4.1.0-4968-ge0b77379,
Arnold Robbins <=