Changeset 2086 for trunk/base


Ignore:
Timestamp:
Feb 26, 2003, 10:48:31 PM (21 years ago)
Author:
kevin
Message:

Don't build the target port twice.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r2084 r2086  
    316316                dportdepends $dport 1 1
    317317               
    318                 # Select out the dependents along the critical path
     318                # Select out the dependents along the critical path,
     319                # but exclude this dport, we might not be installing it.
    319320                set dlist [dlist_append_dependents $darwinports::open_dports $dport {}]
    320321               
     322                dlist_delete dlist $dport
     323
    321324                # install them
    322                 set dlist [dlist_eval $darwinports::open_dports _dporttest [list _dportexec "install"]]
    323         }
    324 
    325         if {$dlist != {}} {
    326                 ui_error "$target terminated due to an error while installing a dependency."
    327         } else {
    328                 return [$workername eval eval_targets $target]
    329         }
     325                set dlist [dlist_eval $dlist _dporttest [list _dportexec "install"]]
     326               
     327                if {$dlist != {}} {
     328                        ui_error "The following dependencies failed to build:"
     329                        foreach ditem $dlist {
     330                                ui_error "[ditem_key $ditem provides]" nonl
     331                        }
     332                        ui_error ""
     333                        return 1
     334                }
     335        }
     336       
     337        # Build this port with the specified target
     338        return [$workername eval eval_targets $target]
     339       
    330340        return 0
    331341}
Note: See TracChangeset for help on using the changeset viewer.