[107667] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[jeremyhu at macports.org]

Revision: 107667
          https://trac.macports.org/changeset/107667
Author:   jeremyhu at macports.org
Date:     2013-07-03 21:53:46 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
Don't complain if typelibs differ (#39629)

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2013-07-04 03:18:06 UTC (rev 107666)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2013-07-04 04:53:46 UTC (rev 107667)
@@ -577,6 +577,13 @@
 
                                             # nothing has worked so far.
                                             switch -glob ${fl} {
+                                                *.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}
+                                                }
                                                 *.jar {
                                                     # jar files can be different because of timestamp
                                                     ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; assume timestamp difference"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130703/db12d460/attachment.html>