<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/677ad972003efd054a7f255863974ea070a656c9">https://github.com/macports/macports-ports/commit/677ad972003efd054a7f255863974ea070a656c9</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 677ad97 muniversal PG: handle new directory structure
</span>677ad97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 677ad972003efd054a7f255863974ea070a656c9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 19 04:32:13 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: handle new directory structure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If {build,destroot,test}.dir is a subdirectory of configure.dir,
</span><span style='display:block; white-space:pre;color:#404040;'> append arch value to the ${configure.dir} part instead of
</span><span style='display:block; white-space:pre;color:#404040;'> to the entire directory name.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See, e.g., qca-qt5, qca-qt5-ossl, and qca-qt5-cyrus-sasl
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 30 +++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 31c1b1a..e01d741 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,8 +394,14 @@ variant universal {
</span> # The build directory is inside the source directory, so put in the new source directory name.
option build.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${build.dir}]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The build directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option build.dir ${build.dir}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match "${configure.dir}/*" ${build.dir}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The build directory is outside the source directory, and ${build.dir} is a subdirectory of ${configure.dir}, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # append ${arch} to the ${configure.dir} part
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option build.dir [string map "${configure.dir} ${configure.dir}-${arch}" ${build.dir}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The build directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option build.dir ${build.dir}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if { ![file exists ${build.dir}] } {
file mkdir ${build.dir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,8 +437,14 @@ variant universal {
</span> # The destroot directory is inside the source directory, so put in the new source directory name.
option destroot.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${destroot.dir}]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The destroot directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option destroot.dir ${destroot.dir}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match "${configure.dir}/*" ${destroot.dir}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The destroot directory is outside the source directory, and ${destroot.dir} is a subdirectory of ${configure.dir}, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # append ${arch} to the ${configure.dir} part
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option destroot.dir [string map "${configure.dir} ${configure.dir}-${arch}" ${destroot.dir}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The destroot directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option destroot.dir ${destroot.dir}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if { ![file exists ${destroot.dir}] } {
file mkdir ${destroot.dir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,8 +771,14 @@ variant universal {
</span> # The test directory is inside the source directory, so put in the new source directory name.
option test.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${test.dir}]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The test directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option test.dir ${test.dir}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match "${configure.dir}/*" ${test.dir}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The test directory is outside the source directory, and ${test.dir} is a subdirectory of ${configure.dir}, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # append ${arch} to the ${configure.dir} part
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option test.dir [string map "${configure.dir} ${configure.dir}-${arch}" ${test.dir}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The test directory is outside the source directory, so give it a new name by appending ${arch}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option test.dir ${test.dir}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if { ![file exists ${test.dir}] } {
file mkdir ${test.dir}
}
</pre><pre style='margin:0'>
</pre>