[55283] branches/release_1_8/base/src/port1.0

[jmr at macports.org]

Revision: 55283
          http://trac.macports.org/changeset/55283
Author:   jmr at macports.org
Date:     2009-08-07 20:05:45 -0700 (Fri, 07 Aug 2009)
Log Message:
-----------
Back out r54368 (setting of CPATH and LIBRARY_PATH in commands' environment) for the 1.8 branch. This is a risky change that has not yet been tested enough.

Modified Paths:
--------------
    branches/release_1_8/base/src/port1.0/portmain.tcl
    branches/release_1_8/base/src/port1.0/portutil.tcl

Modified: branches/release_1_8/base/src/port1.0/portmain.tcl
===================================================================
--- branches/release_1_8/base/src/port1.0/portmain.tcl	2009-08-08 02:52:50 UTC (rev 55282)
+++ branches/release_1_8/base/src/port1.0/portmain.tcl	2009-08-08 03:05:45 UTC (rev 55283)
@@ -48,7 +48,6 @@
 options long_description description homepage license provides conflicts replaced_by
 options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group macosx_deployment_target
 options universal_variant os.universal_supported
-options compiler.cpath compiler.library_path
 
 # Export options via PortInfo
 options_export name version revision epoch categories maintainers platforms description long_description homepage license provides conflicts replaced_by
@@ -112,9 +111,6 @@
 
 default universal_variant yes
 
-default compiler.cpath {${prefix}/include}
-default compiler.library_path {${prefix}/lib}
-
 # Select implicit variants
 if {[info exists os.platform] && ![info exists variations(${os.platform})]} { variant_set ${os.platform}}
 if {[info exists os.arch] && ![info exists variations(${os.arch})]} { variant_set ${os.arch} }

Modified: branches/release_1_8/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_1_8/base/src/port1.0/portutil.tcl	2009-08-08 02:52:50 UTC (rev 55282)
+++ branches/release_1_8/base/src/port1.0/portutil.tcl	2009-08-08 03:05:45 UTC (rev 55283)
@@ -358,12 +358,6 @@
     if {[option macosx_deployment_target] ne ""} {
         set ${command}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target]
     }
-    if {[option compiler.cpath] ne ""} {
-        set ${command}.env_array(CPATH) [join [option compiler.cpath] :]
-    }
-    if {[option compiler.library_path] ne ""} {
-        set ${command}.env_array(LIBRARY_PATH) [join [option compiler.library_path] :]
-    }
 
     # Debug that.
     ui_debug "Environment: [environment_array_to_string ${command}.env_array]"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090807/27171254/attachment.html>