[90108] branches/release_2_0
dports at macports.org
dports at macports.org
Tue Feb 21 23:04:21 PST 2012
Revision: 90108
http://trac.macports.org/changeset/90108
Author: dports at macports.org
Date: 2012-02-21 23:04:21 -0800 (Tue, 21 Feb 2012)
Log Message:
-----------
merge r90107 from trunk:
On Xcode 4.3, give a warning if the command-line utilities package
doesn't appear to be installed.
Check the Xcode version and supported_archs even if the port we're
installing has no dependencies.
Revision Links:
--------------
http://trac.macports.org/changeset/90107
Modified Paths:
--------------
branches/release_2_0/base/src/macports1.0/macports.tcl
branches/release_2_0/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/release_2_0/
branches/release_2_0/base/
Property changes on: branches/release_2_0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088
+ /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107
Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_0/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 06:51:46 UTC (rev 90107)
+++ branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 07:04:21 UTC (rev 90108)
@@ -1696,6 +1696,20 @@
macports::push_log $mport
}
+ # Use _target_needs_deps as a proxy for whether we're going to
+ # build and will therefore need to check Xcode version and
+ # supported_archs.
+ if {[macports::_target_needs_deps $target]} {
+ # possibly warn or error out depending on how old xcode is
+ if {[$workername eval _check_xcode_version] != 0} {
+ return 1
+ }
+ # error out if selected arch(s) not supported by this port
+ if {[$workername eval check_supported_archs] != 0} {
+ return 1
+ }
+ }
+
# Before we build the port, we must build its dependencies.
set dlist {}
if {[macports::_target_needs_deps $target] && [macports::_mport_has_deptypes $mport [macports::_deptypes_for_target $target $workername]]} {
@@ -1703,14 +1717,6 @@
# see if we actually need to build this port
if {($target != "activate" && $target != "install") ||
![$workername eval registry_exists \$subport \$version \$revision \$portvariants]} {
- # possibly warn or error out depending on how old xcode is
- if {[$workername eval _check_xcode_version] != 0} {
- return 1
- }
- # error out if selected arch(s) not supported by this port
- if {[$workername eval check_supported_archs] != 0} {
- return 1
- }
# upgrade dependencies that are already installed
if {![macports::global_option_isset ports_nodeps]} {
Modified: branches/release_2_0/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 06:51:46 UTC (rev 90107)
+++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 07:04:21 UTC (rev 90108)
@@ -2739,6 +2739,16 @@
} elseif {[rpm-vercomp $xcodeversion $ok] < 0} {
ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on Mac OS X ${macosx_version}."
}
+
+ # Xcode 4.3 requires the command-line utilities package to be
+ # installed.
+ if {[vercmp $xcodeversion 4.3] >= 0} {
+ if {![file exists "/usr/bin/make"]} {
+ ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build."
+ ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information."
+ }
+ }
+
}
return 0
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120221/12027e72/attachment-0001.html>
More information about the macports-changes
mailing list