<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5b6b1076acdf34d3c894ec00d30933dbe1b2e6ec">https://github.com/macports/macports-ports/commit/5b6b1076acdf34d3c894ec00d30933dbe1b2e6ec</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5b6b1076acdf34d3c894ec00d30933dbe1b2e6ec
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 18 20:05:19 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> ace, tao: Simplify how build args/env are set
</span>---
devel/ace/Portfile | 13 +++++--------
devel/tao/Portfile | 15 ++++++---------
2 files changed, 11 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ace/Portfile b/devel/ace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46c2c15..c4c0b79 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +61,6 @@ foreach {key value} [array get os.names] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libenv DYLD_LIBRARY_PATH=${worksrcpath}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set aceenv ACE_ROOT=${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set makearg INSTALL_PREFIX=${prefix}
</span> # omit examples and test programs to cut build time by 60%
# set subdirs { . }
set subdirs { ace ACEXML ASNMP Kokyu apps netsvcs }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,11 +114,12 @@ use_configure no
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env "${libenv} ${aceenv}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env DYLD_LIBRARY_PATH=${worksrcpath}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACE_ROOT=${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC=${configure.cc} \
</span> CXX=${configure.cxx} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args ${makearg} all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PREFIX=${prefix}
</span> build {
foreach {subdir} $subdirs {
build.dir ${worksrcpath}/${subdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +127,6 @@ build {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args ${makearg} install
</span> destroot.env {*}${build.env}
destroot.args {*}${build.args}
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tao/Portfile b/devel/tao/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87ef1cd..e12a675 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tao/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tao/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,10 +68,6 @@ foreach {key value} [array get os.names] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libenv DYLD_LIBRARY_PATH=${worksrcpath}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set aceenv ACE_ROOT=${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set taoenv TAO_ROOT=${worksrcpath}/TAO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set makearg INSTALL_PREFIX=${prefix}
</span> set logdir ${prefix}/var/log/tao
set taodaemon tao_cosnaming
set daemondir ${prefix}/etc/LaunchDaemons/org.macports.${taodaemon}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,11 +125,13 @@ use_configure no
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env "${libenv} ${aceenv} ${taoenv}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env DYLD_LIBRARY_PATH=${worksrcpath}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACE_ROOT=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TAO_ROOT=${worksrcpath}/TAO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC=${configure.cc} \
</span> CXX=${configure.cxx} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args ${makearg} all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PREFIX=${prefix}
</span> build {
foreach {subdir} $subdirs {
build.dir ${worksrcpath}/${subdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +139,6 @@ build {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args ${makearg} install
</span> destroot.env {*}${build.env}
destroot.args {*}${build.args}
destroot.keepdirs ${logdir}
</pre><pre style='margin:0'>
</pre>