[69985] trunk/dports/aqua/qtpfsgui/Portfile

[jmr at macports.org]

Revision: 69985
          http://trac.macports.org/changeset/69985
Author:   jmr at macports.org
Date:     2010-07-25 04:07:41 -0700 (Sun, 25 Jul 2010)
Log Message:
-----------
qtpfsgui: fix massively overcomplicated setting of CC/CXX

Modified Paths:
--------------
    trunk/dports/aqua/qtpfsgui/Portfile

Modified: trunk/dports/aqua/qtpfsgui/Portfile
===================================================================
--- trunk/dports/aqua/qtpfsgui/Portfile	2010-07-25 09:34:28 UTC (rev 69984)
+++ trunk/dports/aqua/qtpfsgui/Portfile	2010-07-25 11:07:41 UTC (rev 69985)
@@ -22,29 +22,10 @@
                 sha1    adf037c54f55be50d931fa484cca169c01d0384d \
                 rmd160  5188b2f1679d6788358067fe761d0c72c475bfe9
 
-# This shouldn't be this hard.  Taken from portconfigure.tcl because
-# I couldn't see any other way to set this.
-# Set pre-compiler filter to use (ccache/distcc), if any.
-if {[tbool configure.ccache] && [tbool configure.distcc]} {
-   set filter "ccache "
-   append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
-} elseif {[tbool configure.ccache]} {
-   set filter "ccache "
-} elseif {[tbool configure.distcc]} {
-   set filter "distcc "
-} else {
-   set filter ""
-}
-
-# This also shouldn't be this hard.  All I want to do is set QMAKE_CC to the
-# environment variable CC (and QMAKE_CXX to CXX) that are set in portconfigure.tcl.
-# However, I couldn't figure out how to get the environment variable here so
-# this is a kludge to replicate what's done in portconfigure.tcl.  It should
-# be fixed as soon as possible.
-configure.pre_args  PREFIX=${prefix}
+configure.pre_args  PREFIX="${prefix}"
 configure.args      APPLICATIONS_DIR="${applications_dir}" \
-                    DOCDIR=${prefix}/share/doc/${name} \
-                    QMAKE_CC="${filter}gcc" \
-                    QMAKE_CXX="${filter}g++"
+                    DOCDIR="${prefix}/share/doc/${name}" \
+                    QMAKE_CC="\${CC}" \
+                    QMAKE_CXX="\${CXX}"
 configure.cmd   "LOCALSOFT=${prefix} ${prefix}/libexec/qt4-mac/bin/qmake"
 destroot.destdir INSTALL_ROOT=${destroot}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100725/7b8f15ea/attachment.html>