<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/162f97f4daa4d05d2a472b06abdff1c393da0f6a">https://github.com/macports/macports-base/commit/162f97f4daa4d05d2a472b06abdff1c393da0f6a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 162f97f4daa4d05d2a472b06abdff1c393da0f6a
</span>Author: Satryaji Aulia <satraul@macports.org>
AuthorDate: Tue Jun 18 22:07:46 2019 +0700
<span style='display:block; white-space:pre;color:#404040;'> Move setting DEVELOPER_DIR variable to portconfigure
</span>---
src/port1.0/portbuild.tcl | 1 -
src/port1.0/portconfigure.tcl | 16 ++++++++++++++--
src/port1.0/portdestroot.tcl | 1 -
src/port1.0/portutil.tcl | 11 -----------
4 files changed, 14 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portbuild.tcl b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2db76e3..38e1f6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,6 @@ options build.asroot \
</span> use_parallel_build
commands build
# defaults
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.env {[get_default_env]}
</span> default build.asroot no
default build.dir {${worksrcpath}}
default build.cmd {[portbuild::build_getmaketype]}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ab21eb..3eb593b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@ default compiler.fortran_fallback {[portconfigure::get_fortran_fallback]}
</span> # define options
commands configure autoreconf automake autoconf xmkmf
# defaults
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.env {[get_default_env]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.env ""
</span> default configure.pre_args {--prefix=${prefix}}
default configure.cmd ./configure
default configure.nice {${buildnicevalue}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,11 +256,13 @@ default configure.pkg_config {}
</span> default configure.pkg_config_path {}
options configure.build_arch configure.ld_archflags \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version configure.sdkroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version configure.sdkroot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.developer_dir
</span> default configure.build_arch {[portconfigure::choose_supported_archs ${build_arch}]}
default configure.ld_archflags {[portconfigure::configure_get_ld_archflags]}
default configure.sdk_version {$macosx_sdk_version}
default configure.sdkroot {[portconfigure::configure_get_sdkroot ${configure.sdk_version}]}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.developer_dir {[portconfigure::configure_get_developer_dir]}
</span> foreach tool {cc objc f77 f90 fc} {
options configure.${tool}_archflags
default configure.${tool}_archflags "\[portconfigure::configure_get_archflags $tool\]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,6 +513,15 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
</span> return -code error "Unable to determine location of a macOS SDK."
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# internal function to determine developer_dir according to Xcode dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portconfigure::configure_get_developer_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global use_xcode developer_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[tbool use_xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "/Library/Developer/CommandLineTools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # internal function to determine the "-arch xy" flags for the compiler
proc portconfigure::configure_get_universal_archflags {} {
global configure.universal_archs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1442,6 +1453,7 @@ proc portconfigure::configure_main {args} {
</span> CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \
FFLAGS F90FLAGS FCFLAGS LDFLAGS LIBS CLASSPATH \
PERL PYTHON RUBY INSTALL AWK BISON PKG_CONFIG \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEVELOPER_DIR \
</span> } {
set value [option configure.[string tolower $env_var]]
append_to_environment_value configure $env_var {*}$value
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdestroot.tcl b/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f311af1..35c5f80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,6 @@ commands destroot
</span>
# Set defaults
default destroot.asroot no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default destroot.env {[get_default_env]}
</span> default destroot.dir {${build.dir}}
default destroot.cmd {${build.cmd}}
default destroot.pre_args {[portdestroot::destroot_getargs]}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 72e9304..22aa306 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -508,17 +508,6 @@ proc default_check {optionName index op} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# get_default_env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Unless port is Xcode dependent, returns env which sets developer_dir to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Command Line Tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc get_default_env {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global use_xcode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_xcode]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "DEVELOPER_DIR=/Library/Developer/CommandLineTools"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ##
# Filter options which take strings removing indent to ease Portfile writing
proc handle_option_string {option action args} {
</pre><pre style='margin:0'>
</pre>