<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2f4557e58601393587e365b9011c8d1633338f2b">https://github.com/macports/macports-ports/commit/2f4557e58601393587e365b9011c8d1633338f2b</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 2f4557e mozjs60: Fix universal variant
</span>2f4557e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2f4557e58601393587e365b9011c8d1633338f2b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 26 00:56:59 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mozjs60: Fix universal variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59877
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Thank you for the patch, Mihai.
</span>---
lang/mozjs60/Portfile | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozjs60/Portfile b/lang/mozjs60/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f1fa79..433f679 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozjs60/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozjs60/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,8 @@ configure.cmd ../configure
</span> configure.args --with-system-nspr \
--disable-readline
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
configure.args-append --disable-xcode-checks
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,15 +77,27 @@ destroot.dir ${worksrcpath}/js/src/obj
</span> post-destroot {
# make static lib name version specific to avoid conflict with other mozjs versions
move ${destroot}${prefix}/lib/libjs_static.ajs ${destroot}${prefix}/lib/libjs60_static.ajs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # mozjs60 builds and links with libmozglue.dylib but fails to install it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/js/src/obj/mozglue/build/libmozglue.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dir ${destroot}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mozjs60 builds and links with libmozglue.dylib but fails to install it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}-${arch}/js/src/obj/mozglue/build/libmozglue.dylib ${dir}${prefix}/lib
</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;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # mozjs60 builds and links with libmozglue.dylib but fails to install it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/js/src/obj/mozglue/build/libmozglue.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major} --target=x86_64-apple-${os.platform}${os.major}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --target=i686-apple-${os.platform}${os.major}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(x86_64) "--host=x86_64-apple-${os.platform}${os.major} --target=x86_64-apple-${os.platform}${os.major}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(i386) "--host=i686-apple-${os.platform}${os.major} --target=i686-apple-${os.platform}${os.major}"
</span> } else {
if {${build_arch} eq "i386"} {
configure.args-append \
</pre><pre style='margin:0'>
</pre>