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

jeremyhu at macports.org jeremyhu at macports.org
Mon Aug 19 23:08:32 PDT 2013


Revision: 109791
          https://trac.macports.org/changeset/109791
Author:   jeremyhu at macports.org
Date:     2013-08-19 23:08:32 -0700 (Mon, 19 Aug 2013)
Log Message:
-----------
muniversal: Ignore differences in la files if they're going to be deleted anyways

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-08-20 05:58:43 UTC (rev 109790)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2013-08-20 06:08:32 UTC (rev 109791)
@@ -566,7 +566,6 @@
                                                 copy ${dir1}/${fl} ${dir}/mods64
                                             }
                                         }
-                                        *.la -
                                         *.pc -
                                         *-config {
                                             return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
@@ -583,6 +582,13 @@
 
                                             # nothing has worked so far.
                                             switch -glob ${fl} {
+                                                *.la {
+                                                    if {${destroot.delete_la_files} == "yes"} {
+                                                        ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; ignoring due to delete_la_files"
+                                                    } else {
+                                                        return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
+                                                    }
+                                                }
                                                 *.typelib {
                                                     # Sometimes garbage ends up in ignored trailing bytes
                                                     # https://trac.macports.org/ticket/39629
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130819/535b52fe/attachment.html>


More information about the macports-changes mailing list