[113176] trunk/dports/aqua/qt4-mac

[michaelld at macports.org]

Revision: 113176
          https://trac.macports.org/changeset/113176
Author:   michaelld at macports.org
Date:     2013-11-11 10:23:50 -0800 (Mon, 11 Nov 2013)
Log Message:
-----------
qt4-mac:
+ remove unneeded configure.*flags settings; they are ignored by qmake and qt anyway, so they do not need to be cleared or set here;
+ add setting of -stdlib when using clang; addresses ticket #41301.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac/files/patch-configure.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2013-11-11 17:29:07 UTC (rev 113175)
+++ trunk/dports/aqua/qt4-mac/Portfile	2013-11-11 18:23:50 UTC (rev 113176)
@@ -471,24 +471,6 @@
 # --disable-dependency-tracking is not recognized.
 configure.universal_args-delete --disable-dependency-tracking
 
-################################################################################
-# We do not want flags of any kind -- QT is smart enough to set up its own.    #
-################################################################################
-
-configure.cflags
-configure.cppflags
-configure.cxxflags
-configure.ldflags
-
-configure.universal_cflags
-configure.universal_cppflags
-configure.universal_cxxflags
-configure.universal_ldflags
-
-configure.cc_archflags
-configure.cxx_archflags
-configure.ld_archflags
-
 # Use compiler.cpath and compiler.library_path for all -I and -L
 # entries, so-as to avoid conflicts with already-installed headers and
 # libraries (giving preference to internal-to-this-port first).  CPATH
@@ -623,6 +605,19 @@
 
     configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
 
+    # set which stdlib to use; clang only; use configure.cxx_stdlib if
+    # that exists, and otherwise use libc++ on 10.9 or libstdc++ on
+    # 10.8 or earler.
+
+    if {[string match *clang* ${configure.compiler}]} {
+        if {[info exists configure.cxx_stdlib]} {
+            configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
+        } elseif {${MINOR} = "9"} {
+            configure.env-append QMAKE_STDLIB="-stdlib=libc++"
+        } else {
+            configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
+        }
+    }
 }
 
 post-configure {

Modified: trunk/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff	2013-11-11 17:29:07 UTC (rev 113175)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff	2013-11-11 18:23:50 UTC (rev 113176)
@@ -1,5 +1,5 @@
---- configure.orig	2013-07-06 19:48:02.000000000 -0400
-+++ configure	2013-07-06 19:51:14.000000000 -0400
+--- configure.orig	2013-11-11 12:18:47.000000000 -0500
++++ configure	2013-11-11 12:21:48.000000000 -0500
 @@ -924,12 +924,14 @@
  CFG_ICU=auto
  CFG_SYSTEM_PROXIES=no
@@ -178,6 +178,24 @@
  #define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
  #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
  #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
+@@ -4958,7 +5026,7 @@
+         EXTRA_OBJS=
+         EXTRA_SRCS=
+         EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
+-        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
++        EXTRA_CXXFLAGS="$QMAKE_STDLIB \$(QMAKE_CXXFLAGS)"
+         EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
+ 
+         if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
+@@ -4997,7 +5065,7 @@
+             done
+         fi
+         if [ "$BUILD_ON_MAC" = "yes" ]; then
+-            echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
++            echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
+             echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+             echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
+             EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
 @@ -5005,20 +5073,11 @@
              EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
              EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131111/9233f7a1/attachment-0001.html>