Ticket #39629: muniversal.diff

muniversal-1.0.tcl

@@ -460 +460 @@
         #    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 prefix
+
             set dir1  ${base1}/${prefixDir}
             set dir2  ${base2}/${prefixDir}
             set dir   ${base}/${prefixDir}
@@ -580 +582 @@
                                                 *.typelib {
                                                     # Sometimes garbage ends up in ignored trailing bytes
                                                     # https://trac.macports.org/ticket/39629
-                                                    # TODO: Compare the g-ir-generate output
-                                                    ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; assume trivial difference"
-                                                    copy ${dir1}/${fl} ${dir}
+                                                    # Compare the g-ir-generate output to see if the contents differ
+                                                    set tempdir [mkdtemp "/tmp/muniversal.XXXXXXXX"]
+                                                    set tempfile1 "${tempdir}/${arch1}-[file rootname ${fl}]"
+                                                    set tempfile2 "${tempdir}/${arch2}-[file rootname ${fl}]"
+                                                    system "GI_TYPELIB_PATH='[file dirname "${dir1}/${fl}"]' ${prefix}/bin/g-ir-generate \"${dir1}/${fl}\" > \"${tempfile1}\""
+                                                    system "GI_TYPELIB_PATH='[file dirname "${dir2}/${fl}"]' ${prefix}/bin/g-ir-generate \"${dir2}/${fl}\" > \"${tempfile2}\""
+                                                    set identical "no"
+                                                    if {![catch {system "/usr/bin/cmp -s \"${tempfile1}\" \"${tempfile2}\""}]} {
+                                                        # files are identical
+                                                        ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2} but the contents are the same"
+                                                        set identical "yes"
+                                                        copy ${dir1}/${fl} ${dir}
+                                                    }
+                                                    delete ${tempfile1} ${tempfile2} ${tempdir}
+                                                    if {${identical} eq "no"} {
+                                                        return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
+                                                    }
                                                 }
                                                 *.jar {
                                                     # jar files can be different because of timestamp