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

[ryandesign at macports.org]

Revision: 61090
          http://trac.macports.org/changeset/61090
Author:   ryandesign at macports.org
Date:     2009-12-01 12:57:42 -0800 (Tue, 01 Dec 2009)
Log Message:
-----------
muniversal-1.0.tcl: prevent any attempt to merge *.la, *.pc and *-config files; see #21953

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-12-01 20:54:07 UTC (rev 61089)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-12-01 20:57:42 UTC (rev 61090)
@@ -484,6 +484,11 @@
                                                 copy ${dir1}/${fl} ${dir}/mods64
                                             }
                                         }
+                                        *.la -
+                                        *.pc -
+                                        *-config {
+                                            return -code error "${prefixDir}/${fl} differs in ${base1} and ${base2} and cannot be merged"
+                                        }
                                     }
 
                                     if { ${known_file}=="no" } {
@@ -507,7 +512,7 @@
                                                     copy ${dir1}/${fl} ${dir}
                                                 }
                                                 default {
-                                                    error "Cannot create ${prefixDir}/${fl} from ${base1} and ${base2}"
+                                                    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/20091201/8b134c5b/attachment.html>