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

[mcalhoun at macports.org]

Revision: 49535
          http://trac.macports.org/changeset/49535
Author:   mcalhoun at macports.org
Date:     2009-04-11 15:23:44 -0700 (Sat, 11 Apr 2009)
Log Message:
-----------
muniversal-1.0.tcl: Do not try to merge .elc files.

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	2009-04-11 22:11:14 UTC (rev 49534)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-04-11 22:23:44 UTC (rev 49535)
@@ -468,6 +468,11 @@
                                             ui_debug "universal: merge: ${prefixDir}/${fl} is different in ${base1} and ${base2}; assume timestamp difference"
                                             copy ${dir1}/${fl} ${dir}
                                         }
+                                        *.elc {
+                                            # elc files can be differet because they record when and where they were built.
+                                            ui_debug "universal: merge: ${prefixDir}/${fl} is different in ${base1} and ${base2}; assume trivial difference"
+                                            copy ${dir1}/${fl} ${dir}
+                                        }
                                         default {
                                             error "Can not create ${prefixDir}/${fl} from ${base1} and ${base2}"
                                         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090411/dbc66787/attachment.html>