Ticket #59877: mozjs60.patch

lang/mozjs60/Portfile

@@ -64 +64 @@
 configure.args      --with-system-nspr \
                     --disable-readline
 
+configure.universal_args-delete --disable-dependency-tracking
+
 if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
     configure.args-append   --disable-xcode-checks
 }
@@ -75 +77 @@
 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
-    # mozjs60 builds and links with libmozglue.dylib but fails to install it
-    xinstall -m 0755 ${worksrcpath}/js/src/obj/mozglue/build/libmozglue.dylib ${destroot}${prefix}/lib
+}
+if {[variant_isset universal]} {
+    merger-post-destroot {
+        foreach arch ${universal_archs_to_use} {
+            set dir ${destroot}-${arch}
+            # mozjs60 builds and links with libmozglue.dylib but fails to install it
+            xinstall -m 0755 ${worksrcpath}-${arch}/js/src/obj/mozglue/build/libmozglue.dylib ${dir}${prefix}/lib
+        }
+    }
+} else {
+    post-destroot {
+        # mozjs60 builds and links with libmozglue.dylib but fails to install it
+        xinstall -m 0755 ${worksrcpath}/js/src/obj/mozglue/build/libmozglue.dylib ${destroot}${prefix}/lib
+    }
 }
 
 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}
-    set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major} --target=x86_64-apple-${os.platform}${os.major}"
-    set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --target=i686-apple-${os.platform}${os.major}"
+    set merger_configure_args(x86_64) "--host=x86_64-apple-${os.platform}${os.major} --target=x86_64-apple-${os.platform}${os.major}"
+    set merger_configure_args(i386) "--host=i686-apple-${os.platform}${os.major} --target=i686-apple-${os.platform}${os.major}"
 } else {
     if {${build_arch} eq "i386"} {
         configure.args-append \