[59112] trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl

ryandesign at macports.org ryandesign at macports.org
Fri Oct 9 15:52:19 PDT 2009


Revision: 59112
          http://trac.macports.org/changeset/59112
Author:   ryandesign at macports.org
Date:     2009-10-09 15:52:18 -0700 (Fri, 09 Oct 2009)
Log Message:
-----------
archcheck-1.0.tcl: Recommend rebuilding dependency universal not only when building current port universal but also when building current port for non-default arch

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

Modified: trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2009-10-09 22:48:24 UTC (rev 59111)
+++ trunk/dports/_resources/port1.0/group/archcheck-1.0.tcl	2009-10-09 22:52:18 UTC (rev 59112)
@@ -63,7 +63,9 @@
             if {-1 == [string first " ${requested_arch} " " ${file_archs} "]} {
                 ui_error "You cannot install ${name} for the architecture(s) ${requested_archs}"
                 ui_error "because ${file} only contains the architecture(s) ${file_archs}."
-                if {[variant_exists universal] && [variant_isset universal] && 1 == [llength ${file_archs}]} {
+                # Recommend reinstalling dependency universal if dependency is not universal and
+                # trying to install this port either universal or for non-default build_arch.
+                if {1 == [llength ${file_archs}] && (([variant_exists universal] && [variant_isset universal]) || (${build_arch} != ${configure.build_arch}))} {
                     ui_error "Try reinstalling the port that provides ${file} with the +universal variant."
                 }
                 return -code error "incompatible architectures in dependencies"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091009/27ef32e2/attachment.html>


More information about the macports-changes mailing list