[64120] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
mcalhoun at macports.org
mcalhoun at macports.org
Mon Feb 22 10:11:49 PST 2010
Revision: 64120
http://trac.macports.org/changeset/64120
Author: mcalhoun at macports.org
Date: 2010-02-22 10:11:46 -0800 (Mon, 22 Feb 2010)
Log Message:
-----------
muniversal-1.0.tcl: Assume .el.gz files are the same across architectures.
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 2010-02-22 17:56:06 UTC (rev 64119)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2010-02-22 18:11:46 UTC (rev 64120)
@@ -541,6 +541,17 @@
set identical "yes"
copy ${dir1}/${fl} ${dir}
}
+ if { ${identical}=="no" } {
+ switch -glob ${fl} {
+ *.el.gz {
+ # Emacs lisp files should be same across architectures
+ # the emacs package (and perhaps others) records the date of automatically generated el files
+ ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; assume trivial difference"
+ set identical "yes"
+ copy ${dir1}/${fl} ${dir}
+ }
+ }
+ }
delete ${tempfile1} ${tempfile2} ${tempdir}
if {${identical}=="no"} {
return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100222/fbc76dbb/attachment.html>
More information about the macports-changes
mailing list