Revision: 139031 https://trac.macports.org/changeset/139031 Author: devans@macports.org Date: 2015-07-30 01:20:50 -0700 (Thu, 30 Jul 2015) Log Message: ----------- py-exiv2: tentative fix for sporadic build failures caused by destroot env vars not being consistently set as expected (#48444). Modified Paths: -------------- trunk/dports/python/py-exiv2/Portfile Modified: trunk/dports/python/py-exiv2/Portfile =================================================================== --- trunk/dports/python/py-exiv2/Portfile 2015-07-30 07:41:47 UTC (rev 139030) +++ trunk/dports/python/py-exiv2/Portfile 2015-07-30 08:20:50 UTC (rev 139031) @@ -67,8 +67,8 @@ LDFLAGS="${configure.universal_ldflags} -L${prefix}/lib" } else { build.env-append \ - CXXFLAGS="-I${prefix}/include" \ - LDFLAGS="-L${prefix}/lib" + CXXFLAGS="${configure.cxxflags} -I${prefix}/include" \ + LDFLAGS="${configure.ldflags} -L${prefix}/lib" } } @@ -77,18 +77,21 @@ destroot.args-append \ BOOSTLIB=boost_python-mt \ PYTHONLIB=python${python.branch} - destroot.env-append \ - PREFIX=${prefix}\ - CXX=${configure.cxx} \ - if {[variant_isset universal]} { + pre-destroot { destroot.env-append \ - CXXFLAGS="${configure.universal_cxxflags} -I${prefix}/include" \ - LDFLAGS="${configure.universal_ldflags} -L${prefix}/lib" - } else { - destroot.env-append \ - CXXFLAGS="-I${prefix}/include" \ - LDFLAGS="-L${prefix}/lib" + PREFIX=${prefix} \ + CXX=${configure.cxx} + + if {[variant_isset universal]} { + destroot.env-append \ + CXXFLAGS="${configure.universal_cxxflags} -I${prefix}/include" \ + LDFLAGS="${configure.universal_ldflags} -L${prefix}/lib" + } else { + destroot.env-append \ + CXXFLAGS="${configure.cxxflags} -I${prefix}/include" \ + LDFLAGS="${configure.ldflags} -L${prefix}/lib" + } } livecheck.type regex