<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/23b3f213fb9feab549cdf68eb6b318e8939beb77">https://github.com/macports/macports-ports/commit/23b3f213fb9feab549cdf68eb6b318e8939beb77</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 23b3f213fb9 legacy-support: imrpovements to tiger specific file handling Avids hardcoding file names by globing for files to install
</span>23b3f213fb9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 23b3f213fb9feab549cdf68eb6b318e8939beb77
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Nov 11 15:38:11 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> legacy-support: imrpovements to tiger specific file handling
</span><span style='display:block; white-space:pre;color:#404040;'> Avids hardcoding file names by globing for files to install
</span>---
devel/legacy-support/Portfile | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/legacy-support/Portfile b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d09a295aa1..69666a559f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,7 @@ use_configure no
</span> use_parallel_build no
set max_darwin_reexport 19
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set max_darwin_optool 20
</span>
build.env-append CXX=${configure.cxx} \
CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,26 +84,25 @@ test.env {*}${build.env}
</span> test.run yes
test.target test
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install Tiger-specific fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # slightly modified which command to match behaviour of 10.5+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/tiger_only/bin/which ${destroot}${prefix}/bin/which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NB: these copied-in headers for Tiger will overwrite any similarly-named headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that we add to the include folder in legacysupport. We will have to watch for that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add suitable Availability*.h headers for Tiger
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/tiger_only/include/Availability.h ${destroot}${prefix}/include/LegacySupport/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/tiger_only/include/AvailabilityInternal.h ${destroot}${prefix}/include/LegacySupport/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "${name}-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # copyfile exists in libSystem, just needs the header from 10.5 to work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/tiger_only/include/copyfile.h ${destroot}${prefix}/include/LegacySupport/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc tiger_copy {from to} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f [glob -directory ${from} *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set base_dir [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${to}${base_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiger_copy ${f} ${to}${base_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Copying ${f} to ${to}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${f} ${to}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# install Tiger-specific fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy all tiger specific 'binaries' and includes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiger_copy ${worksrcpath}/tiger_only/bin ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiger_copy ${worksrcpath}/tiger_only/include ${destroot}${prefix}/include/LegacySupport/
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +110,7 @@ platform darwin 8 {
</span> # on newer systems as the reexport link option to /usr/lib/libSystem.B.dylib
# does not work, due to the file system library cache added in macOS11.
# Fallback to using optool here. Optool also currently not working on arm.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${build_arch} ne "arm64" && ${os.major} > ${max_darwin_reexport} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${build_arch} ne "arm64" && ${os.major} > ${max_darwin_reexport} && ${os.major} <= ${max_darwin_optool} } {
</span> depends_build-append port:optool
post-destroot {
set legSupp ${prefix}/lib/libMacportsLegacySupport.dylib
</pre><pre style='margin:0'>
</pre>