<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/88b81f7999e4ca31eff4dbae6f0526f1992cc801">https://github.com/macports/macports-ports/commit/88b81f7999e4ca31eff4dbae6f0526f1992cc801</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 88b81f7 dmd family: fix makefile variables
</span>88b81f7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88b81f7999e4ca31eff4dbae6f0526f1992cc801
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sat May 12 12:12:23 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> dmd family: fix makefile variables
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Set CC flag (UsingTheRightCompiler).
</span><span style='display:block; white-space:pre;color:#404040;'> Do not set MACOSX_DEPLOYMENT_TARGET in makefiles.
</span><span style='display:block; white-space:pre;color:#404040;'> Append to CFLAGS instead of replacing.
</span>---
lang/dmd/Portfile | 12 +++++++++++-
lang/dmd/files/patch-posix.mak.diff | 13 +++++++++++++
lang/druntime/Portfile | 5 ++++-
lang/druntime/files/patch-posix.mak.diff | 24 ++++++++++++++++++++++++
lang/phobos/Portfile | 6 ++++--
lang/phobos/files/patch-posix.mak.diff | 27 +++++++++++++++++++++++++++
6 files changed, 83 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/dmd/Portfile b/lang/dmd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9e8328..6e2147f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/dmd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/dmd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup muniversal 1.0
github.setup dlang dmd 2.080.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang
platforms darwin
license Boost-1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +25,8 @@ post-patch {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-posix.mak.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:dmd-bootstrap
depends_skip_archcheck-append dmd-bootstrap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +42,7 @@ post-extract {
</span> # Another solution would be the use of override directive in posix.mak.
build.args -f posix.mak all man \
HOST_CXX="${configure.cxx}" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc}" \
</span> LDFLAGS="${configure.ldflags} -framework CoreServices" \
ENVP="MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}" \
SYSCONFDIR=${prefix}/etc/${name} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,17 +51,23 @@ build.args -f posix.mak all man \
</span> if { ![variant_isset universal] } {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.args-append MODEL=64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append MODEL=64
</span> } else {
build.args-append MODEL=32
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append MODEL=32
</span> }
} else {
lappend merger_build_args(x86_64) MODEL=64
lappend merger_build_args(i386) MODEL=32
lappend merger_build_args(ppc64) MODEL=64
lappend merger_build_args(ppc) MODEL=32
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_args(x86_64) MODEL=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_args(i386) MODEL=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_args(ppc64) MODEL=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_args(ppc) MODEL=32
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append \
</span> -f makefile_macports_install \
PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/dmd/files/patch-posix.mak.diff b/lang/dmd/files/patch-posix.mak.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..206dd6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/dmd/files/patch-posix.mak.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/posix.mak.orig 2018-05-01 06:42:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/posix.mak 2018-05-12 12:03:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,10 +95,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G = $(GENERATED)/$(OS)/$(BUILD)/$(MODEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(shell mkdir -p $G)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq (osx,$(OS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export MACOSX_DEPLOYMENT_TARGET=10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOST_CXX=c++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compatibility with old behavior
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(HOST_CC),)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/druntime/Portfile b/lang/druntime/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec21995..0a29113 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/druntime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/druntime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup muniversal 1.0
github.setup dlang druntime 2.080.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang
platforms darwin
license Boost-1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +24,13 @@ checksums rmd160 c37bb020454e0ee641262957dbbd49e825e63365 \
</span>
depends_lib port:dmd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-posix.mak.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.args -f posix.mak \
CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=\"${configure.cflags}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_CFLAGS=\"${configure.cflags}\" \
</span> DMD=${prefix}/bin/dmd \
DRUNTIME_BASE=${name} \
DMD_DIR=${prefix}/share/dmd
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/druntime/files/patch-posix.mak.diff b/lang/druntime/files/patch-posix.mak.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a9597eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/druntime/files/patch-posix.mak.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- posix.mak.orig 2018-04-17 02:34:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ posix.mak 2018-05-12 11:32:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (osx,$(OS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOTDLL:=.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOTLIB:=.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export MACOSX_DEPLOYMENT_TARGET=10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOTDLL:=.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOTLIB:=.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,12 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(BUILD),debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS += -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS += -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS=$(MACPORTS_CFLAGS) $(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (solaris,$(OS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS+=-D_REENTRANT # for thread-safe errno
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/phobos/Portfile b/lang/phobos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dcced07..75b0b74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/phobos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/phobos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup muniversal 1.0
</span> PortGroup active_variants 1.1
github.setup dlang phobos 2.080.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang
platforms darwin
license Boost-1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +22,8 @@ checksums rmd160 815bd89416b6aa91e65afa5c5108230c551e6718 \
</span>
depends_lib port:druntime
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gzlib.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gzlib.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-posix.mak.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +56,7 @@ build.args -f posix.mak \
</span> DMD_DIR=${prefix}/share/dmd \
DRUNTIME_PATH=${prefix}/include/druntime \
CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=\"${configure.cflags}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_CFLAGS=\"${configure.cflags}\" \
</span> DMD=${prefix}/bin/dmd
build.target ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/phobos/files/patch-posix.mak.diff b/lang/phobos/files/patch-posix.mak.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0ce4cc1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/phobos/files/patch-posix.mak.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- posix.mak.orig 2018-04-30 07:38:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ posix.mak 2018-05-12 11:48:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,10 +40,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(DMD_DIR)/src/osmodel.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq (osx,$(OS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- export MACOSX_DEPLOYMENT_TARGET=10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default to a release build, override with BUILD=debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (,$(BUILD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_WAS_SPECIFIED=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,12 +108,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set CFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS=$(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(BUILD),debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS += -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS += -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS=$(MACPORTS_CFLAGS) $(MODEL_FLAG) -fPIC -DHAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set DFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DFLAGS=-conf= -I$(DRUNTIME_PATH)/import $(DMDEXTRAFLAGS) -w -de -dip25 $(MODEL_FLAG) $(PIC) -transition=complex
</span></pre><pre style='margin:0'>
</pre>