<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/40b9b64f091a082167b4152571eaf3f183a8b889">https://github.com/macports/macports-ports/commit/40b9b64f091a082167b4152571eaf3f183a8b889</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 40b9b64 gcl: Do not override the deployment target
</span>40b9b64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40b9b64f091a082167b4152571eaf3f183a8b889
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Oct 10 07:17:35 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gcl: Do not override the deployment target
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build system sets MACOSX_DEPLOYMENT_TARGET to 10.2. This was done
</span><span style='display:block; white-space:pre;color:#404040;'> when Mac support was originally added back in July 2003:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> http://git.savannah.gnu.org/cgit/gcl.git/commit/?id=b54cbfe43d04f84c53c6e211a763b8e02185f4fc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> At that time the current version of Mac OS X was 10.2 and the default
</span><span style='display:block; white-space:pre;color:#404040;'> value of MACOSX_DEPLOYMENT_TARGET was 10.1, which was apparently too
</span><span style='display:block; white-space:pre;color:#404040;'> old for gcl so they changed it to 10.2.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Meanwhile, macOS Mojave does not support deployment targets that old so
</span><span style='display:block; white-space:pre;color:#404040;'> I've removed this setting from the build system to allow the value set
</span><span style='display:block; white-space:pre;color:#404040;'> by MacPorts (which matches the macOS version) to be used.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build fails if the deployment target is 10.6 or later, which I fixed
</span><span style='display:block; white-space:pre;color:#404040;'> by adding -fno-pie to CFLAGS and LDFLAGS, per a suggestion I found in a
</span><span style='display:block; white-space:pre;color:#404040;'> ticket with a similar error message about emacs.
</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/57312
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build system also overrides the compiler, for reasons which appear
</span><span style='display:block; white-space:pre;color:#404040;'> no longer to be relevant. We already had a patch to remove this override
</span><span style='display:block; white-space:pre;color:#404040;'> on Intel. I've expanded that patch to include PowerPC.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also disable the universal variant because it fails to configure.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also prevent building while the port is active due to a different value
</span><span style='display:block; white-space:pre;color:#404040;'> being detected for EMACS_DEFAULT_EL at configure time if the port is
</span><span style='display:block; white-space:pre;color:#404040;'> already active, resulting in a destroot failure.
</span>---
lang/gcl/Portfile | 24 ++++++++++---
lang/gcl/files/configure.patch | 1 +
...t-override-CC-or-MACOSX_DEPLOYMENT_TARGET.patch | 39 ++++++++++++++++++++++
lang/gcl/files/h-386-macosx.defs.patch | 14 --------
4 files changed, 59 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcl/Portfile b/lang/gcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c890a58..1cd1a4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name gcl
version 2.6.12
<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-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,17 +23,30 @@ depends_lib port:gettext \
</span> port:readline
master_sites gnu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 51414c7d3da76220246807985763656b6a2ef4d9 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8eb8491bccafc49683599e92a30ba36db0825dd4bb138a104cb662b9b0d090e8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8eb8491bccafc49683599e92a30ba36db0825dd4bb138a104cb662b9b0d090e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7031837
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't compile with -Wno-unused-but-set-variable.
</span> patchfiles configure.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append dont-override-CC-or-MACOSX_DEPLOYMENT_TARGET.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# checking for required object alignment... configure: error: Cannot find object alignent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use the right compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append h-386-macosx.defs.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cp: .../destroot/opt/local/share/emacs/site-lisp/gcl/opt/local/etc/default.el: No such file or directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build ${name}
</span>
configure.cflags-append -std=gnu89
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Without -fno-pie, build fails if using deployment target 10.6 or later:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# >unexec: cannot write section __data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/30268
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -fno-pie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -fno-pie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-notify \
--disable-statsysbfd \
--enable-ansi \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcl/files/configure.patch b/lang/gcl/files/configure.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cf91882..325c3ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcl/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcl/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't compile with -Wno-unused-but-set-variable.
</span> --- configure.orig 2014-09-07 01:45:30.000000000 +1000
+++ configure 2014-10-16 03:05:26.000000000 +1100
@@ -4176,32 +4176,6 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcl/files/dont-override-CC-or-MACOSX_DEPLOYMENT_TARGET.patch b/lang/gcl/files/dont-override-CC-or-MACOSX_DEPLOYMENT_TARGET.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..448bc24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcl/files/dont-override-CC-or-MACOSX_DEPLOYMENT_TARGET.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override CC or MACOSX_DEPLOYMENT_TARGET.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- h/386-macosx.defs.orig 2014-10-23 16:29:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ h/386-macosx.defs 2018-10-10 04:28:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,16 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # powerpc-macosx.defs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Disable Apple's custom C preprocessor which gets confused when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# preprocessing some of the *.d files in the o/ subdirectory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = gcc $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set this to avoid warnings when linking against libncurses.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is due to the requirements of the two level namespace.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS := `echo $(LIBS) | sed -e 's/-lncurses/ /'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Set this for the linker to operate correctly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MACOSX_DEPLOYMENT_TARGET = 10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define this to build an executable rsym.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RSYM = rsym
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(findstring bfd,$(LIBS)),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- h/powerpc-macosx.defs.orig 2014-10-23 16:29:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ h/powerpc-macosx.defs 2018-10-10 04:29:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,16 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # powerpc-macosx.defs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Disable Apple's custom C preprocessor which gets confused when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# preprocessing some of the *.d files in the o/ subdirectory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = gcc $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set this to avoid warnings when linking against libncurses.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is due to the requirements of the two level namespace.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS := `echo $(LIBS) | sed -e 's/-lncurses/ /'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Set this for the linker to operate correctly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MACOSX_DEPLOYMENT_TARGET = 10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define this to build an executable rsym.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RSYM = rsym
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(findstring bfd,$(LIBS)),)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcl/files/h-386-macosx.defs.patch b/lang/gcl/files/h-386-macosx.defs.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31de4ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcl/files/h-386-macosx.defs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: h/386-macosx.defs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- h/386-macosx.defs.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ h/386-macosx.defs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # powerpc-macosx.defs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Disable Apple's custom C preprocessor which gets confused when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# preprocessing some of the *.d files in the o/ subdirectory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = gcc $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set this to avoid warnings when linking against libncurses.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is due to the requirements of the two level namespace.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS := `echo $(LIBS) | sed -e 's/-lncurses/ /'`
</span></pre><pre style='margin:0'>
</pre>