Revision: 90175 http://trac.macports.org/changeset/90175 Author: jeremyhu@macports.org Date: 2012-02-24 22:34:45 -0800 (Fri, 24 Feb 2012) Log Message: ----------- merge r89537-89539 from trunk: Fix use_xmkmf to honor xmkmf.env for its make Makefiles phase, required for the workaround for #31504 Set IMAKECPP for use_xmkmf Revision Links: -------------- http://trac.macports.org/changeset/89537 Modified Paths: -------------- branches/release_2_0/base/src/port1.0/portconfigure.tcl branches/release_2_0/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/release_2_0/base/ branches/release_2_0/base/src/port1.0/portconfigure.tcl 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,80248,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,84908-84909,84931,84937,86131,88032,88045,88179,88185,89429,89612,89839,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112,90151,90154 /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,80248,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,84908-84909,84931,84937,86131,88032,88045,88179,88185,89429,89537-89539,89612,89839,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112,90151,90154 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portconfigure.tcl 2012-02-25 06:30:03 UTC (rev 90174) +++ branches/release_2_0/base/src/port1.0/portconfigure.tcl 2012-02-25 06:34:45 UTC (rev 90175) @@ -595,13 +595,17 @@ } if {[tbool use_xmkmf]} { + parse_environment xmkmf + append_list_to_environment_value xmkmf "IMAKECPP" ${configure.cpp} if {[catch {command_exec xmkmf} result]} { return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]" - } else { - # XXX should probably use make command abstraction but we know that - # X11 will already set things up so that "make Makefiles" always works. - system "cd ${worksrcpath} && make Makefiles" } + + parse_environment xmkmf + append_list_to_environment_value xmkmf "IMAKECPP" ${configure.cpp} + if {[catch {command_exec "cd ${worksrcpath} && make Makefiles" -varprefix xmkmf} result]} { + return -code error "[format [msgcat::mc "%s failure: %s"] "make Makefiles" $result]" + } } elseif {[tbool use_configure]} { # Merge (ld|c|cpp|cxx)flags into the environment variable. parse_environment configure Property changes on: branches/release_2_0/base/src/port1.0/portconfigure.tcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/port1.0/portconfigure.tcl:37343-46937 /branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl:51231-60371 /branches/universal-sanity/base/src/port1.0/portconfigure.tcl:51872-52323 /branches/variant-descs-14482/base/src/port1.0/portconfigure.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/port1.0/portconfigure.tcl: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,80248,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,84908-84909,84931,84937,86131,88032,88045,88179,88185,89429,89612,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112,90151,90154,90169 /users/perry/base-bugs_and_notes/src/port1.0/portconfigure.tcl:45682-46060 /users/perry/base-select/src/port1.0/portconfigure.tcl:44044-44692 + /branches/gsoc08-privileges/base/src/port1.0/portconfigure.tcl:37343-46937 /branches/gsoc09-logging/base/src/port1.0/portconfigure.tcl:51231-60371 /branches/universal-sanity/base/src/port1.0/portconfigure.tcl:51872-52323 /branches/variant-descs-14482/base/src/port1.0/portconfigure.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/port1.0/portconfigure.tcl: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,80248,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,84908-84909,84931,84937,86131,88032,88045,88179,88185,89429,89537-89539,89612,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112,90151,90154,90169 /users/perry/base-bugs_and_notes/src/port1.0/portconfigure.tcl:45682-46060 /users/perry/base-select/src/port1.0/portconfigure.tcl:44044-44692 Modified: branches/release_2_0/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-25 06:30:03 UTC (rev 90174) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-25 06:34:45 UTC (rev 90175) @@ -324,12 +324,13 @@ } # Given a command name, execute it with the options. -# command_exec command [-notty] [command_prefix [command_suffix]] +# command_exec command [-notty] [-varprefix variable_prefix] [command_prefix [command_suffix]] # command name of the command +# variable_prefix name of the variable prefix to use (defaults to command) # command_prefix additional command prefix (typically pipe command) # command_suffix additional command suffix (typically redirection) proc command_exec {command args} { - global ${command}.env ${command}.env_array ${command}.nice env macosx_version + set varprefix "${command}" set notty "" set command_prefix "" set command_suffix "" @@ -340,6 +341,11 @@ set args [lrange $args 1 end] } + if {[lindex $args 0] == "-varprefix"} { + set varprefix [lindex $args 1] + set args [lrange $args 2 end] + } + if {[llength $args] > 0} { set command_prefix [lindex $args 0] if {[llength $args] > 1} { @@ -348,33 +354,39 @@ } } + global ${varprefix}.env ${varprefix}.env_array ${varprefix}.nice env macosx_version + # Set the environment. # If the array doesn't exist, we create it with the value - # coming from ${command}.env + # coming from ${varprefix}.env # Otherwise, it means the caller actually played with the environment # array already (e.g. configure flags). - if {![array exists ${command}.env_array]} { - parse_environment ${command} + if {![array exists ${varprefix}.env_array]} { + parse_environment ${varprefix} } if {[option macosx_deployment_target] ne ""} { - set ${command}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target] + set ${varprefix}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target] } - set ${command}.env_array(CC_PRINT_OPTIONS) "YES" - set ${command}.env_array(CC_PRINT_OPTIONS_FILE) [file join [option workpath] ".CC_PRINT_OPTIONS"] + set ${varprefix}.env_array(CC_PRINT_OPTIONS) "YES" + set ${varprefix}.env_array(CC_PRINT_OPTIONS_FILE) [file join [option workpath] ".CC_PRINT_OPTIONS"] if {[option compiler.cpath] ne ""} { - set ${command}.env_array(CPATH) [join [option compiler.cpath] :] + set ${varprefix}.env_array(CPATH) [join [option compiler.cpath] :] } if {[option compiler.library_path] ne ""} { - set ${command}.env_array(LIBRARY_PATH) [join [option compiler.library_path] :] + set ${varprefix}.env_array(LIBRARY_PATH) [join [option compiler.library_path] :] } + # When building, g-ir-scanner should not save its cache to $HOME + # See: https://trac.macports.org/ticket/26783 + set ${varprefix}.env_array(GI_SCANNER_DISABLE_CACHE) "1" + # Debug that. - ui_debug "Environment: [environment_array_to_string ${command}.env_array]" + ui_debug "Environment: [environment_array_to_string ${varprefix}.env_array]" # Prepare nice value change set nice "" - if {[info exists ${command}.nice] && [set ${command}.nice] != ""} { - set nice "-nice [set ${command}.nice]" + if {[info exists ${varprefix}.nice] && [set ${varprefix}.nice] != ""} { + set nice "-nice [set ${varprefix}.nice]" } # Get the command string. @@ -385,14 +397,14 @@ # Save the environment. array set saved_env [array get env] # Set the overriden variables from the portfile. - array set env [array get ${command}.env_array] + array set env [array get ${varprefix}.env_array] # Call the command. set fullcmdstring "$command_prefix $cmdstring $command_suffix" ui_debug "Executing command line: $fullcmdstring" set code [catch {eval system $notty $nice \$fullcmdstring} result] # Unset the command array until next time. - array unset ${command}.env_array + array unset ${varprefix}.env_array # Restore the environment. array unset env *