Ticket #57802: muniversal.diff

_resources/port1.0/group/muniversal-1.0.tcl

@@ -100 +100 @@
 variant universal {
     global universal_archs_to_use
 
+    if {${supported_archs} eq "noarch"} {
+        ui_warn "Port ${subport} is architecture-agnostic and shouldn't have nor use the +universal variant"
+        #return
+    }
+
+    if {[string match macports-clang* ${configure.compiler}]} {
+        depends_build-append    port:cctools
+    }
+
     foreach arch ${universal_archs} {
         configure.universal_cflags-delete    -arch ${arch}
         configure.universal_cxxflags-delete  -arch ${arch}
@@ -546 +556 @@
         #    merger_dont_diff: list of files for which /usr/bin/diff ${diffFormat} will not merge correctly
         #          diffFormat: format used by diff to merge two text files
         proc merge2Dir {base1 base2 base prefixDir arch1 arch2 merger_dont_diff diffFormat} {
+            global configure.compiler prefix
+
             set dir1  ${base1}/${prefixDir}
             set dir2  ${base2}/${prefixDir}
             set dir   ${base}/${prefixDir}
 
+            if {[string match macports-clang* ${configure.compiler}]} {
+                set lipo_cmd            ${prefix}/bin/lipo
+                set libtool_cmd         ${prefix}/bin/libtool
+            } else {
+                set lipo_cmd            /usr/bin/lipo
+                set libtool_cmd         /usr/bin/libtool
+            }
+
             xinstall -d -m 0755 ${dir}
 
             foreach fl [glob -directory ${dir2} -tails -nocomplain * .*] {
@@ -600 +620 @@
                         } else {
                             # Actually try to merge the files
                             # First try lipo, then libtool
-                            if { ! [catch {system "/usr/bin/lipo -create \"${dir1}/${fl}\" \"${dir2}/${fl}\" -output \"${dir}/${fl}\""}] } {
+                            if { ! [catch {system "${lipo_cmd} -create \"${dir1}/${fl}\" \"${dir2}/${fl}\" -output \"${dir}/${fl}\""}] } {
                                 # lipo worked
                                 ui_debug "universal: merge: lipo created ${prefixDir}/${fl}"
-                            } elseif { ! [catch {system "/usr/bin/libtool \"${dir1}/${fl}\" \"${dir2}/${fl}\" -o \"${dir}/${fl}\""}] } {
+                            } elseif { ! [catch {system "${libtool_cmd} \"${dir1}/${fl}\" \"${dir2}/${fl}\" -o \"${dir}/${fl}\""}] } {
                                 # libtool worked
                                 ui_debug "universal: merge: libtool created ${prefixDir}/${fl}"
                             } else {