Revision: 130565 https://trac.macports.org/changeset/130565 Author: jeremyhu@macports.org Date: 2015-01-01 13:56:35 -0800 (Thu, 01 Jan 2015) Log Message: ----------- python-1.0: Set environment variables during destroot If CC and others are set differently between build and destroot, the port will be debuilt during the destroot phase due to the change. This can result in the port being rebuild incorrectly (eg: for the compiler default architecture instead of the chosen arch, or not universal). Modified Paths: -------------- trunk/dports/_resources/port1.0/group/python-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/python-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/python-1.0.tcl 2015-01-01 16:20:54 UTC (rev 130564) +++ trunk/dports/_resources/port1.0/group/python-1.0.tcl 2015-01-01 21:56:35 UTC (rev 130565) @@ -115,24 +115,36 @@ pre-build { if {${python.add_archflags}} { if {[variant_exists universal] && [variant_isset universal]} { - build.env-append CFLAGS="${configure.universal_cflags}" \ - OBJCFLAGS="${configure.universal_cflags}" \ - CXXFLAGS="${configure.universal_cxxflags}" \ - LDFLAGS="${configure.universal_ldflags}" + build.env-append CFLAGS="${configure.universal_cflags}" \ + OBJCFLAGS="${configure.universal_cflags}" \ + CXXFLAGS="${configure.universal_cxxflags}" \ + LDFLAGS="${configure.universal_ldflags}" + destroot.env-append CFLAGS="${configure.universal_cflags}" \ + OBJCFLAGS="${configure.universal_cflags}" \ + CXXFLAGS="${configure.universal_cxxflags}" \ + LDFLAGS="${configure.universal_ldflags}" } else { - build.env-append CFLAGS="${configure.cc_archflags}" \ - OBJCFLAGS="${configure.objc_archflags}" \ - CXXFLAGS="${configure.cxx_archflags}" \ - FFLAGS="${configure.f77_archflags}" \ - F90FLAGS="${configure.f90_archflags}" \ - FCFLAGS="${configure.fc_archflags}" \ - LDFLAGS="${configure.ld_archflags}" + build.env-append CFLAGS="${configure.cc_archflags}" \ + OBJCFLAGS="${configure.objc_archflags}" \ + CXXFLAGS="${configure.cxx_archflags}" \ + FFLAGS="${configure.f77_archflags}" \ + F90FLAGS="${configure.f90_archflags}" \ + FCFLAGS="${configure.fc_archflags}" \ + LDFLAGS="${configure.ld_archflags}" + destroot.env-append CFLAGS="${configure.cc_archflags}" \ + OBJCFLAGS="${configure.objc_archflags}" \ + CXXFLAGS="${configure.cxx_archflags}" \ + FFLAGS="${configure.f77_archflags}" \ + F90FLAGS="${configure.f90_archflags}" \ + FCFLAGS="${configure.fc_archflags}" \ + LDFLAGS="${configure.ld_archflags}" } } if {${python.set_compiler}} { foreach var {cc objc cxx fc f77 f90} { if {[set configure.${var}] ne ""} { build.env-append [string toupper $var]="[set configure.${var}]" + destroot.env-append [string toupper $var]="[set configure.${var}]" } } }