[144467] trunk/dports/aqua/qt5/Portfile

[mcalhoun at macports.org]

Revision: 144467
          https://trac.macports.org/changeset/144467
Author:   mcalhoun at macports.org
Date:     2016-01-09 09:23:26 -0800 (Sat, 09 Jan 2016)
Log Message:
-----------
qt5-qtwebkit: revert part of r144445 just for qt5-qtwebkit since -mmacosx-version-min=10.7 is required
no revbump since port builds successfully or not at all

Revision Links:
--------------
    https://trac.macports.org/changeset/144445

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

Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile	2016-01-09 17:15:35 UTC (rev 144466)
+++ trunk/dports/aqua/qt5/Portfile	2016-01-09 17:23:26 UTC (rev 144467)
@@ -775,6 +775,23 @@
     }
     PortGroup           qmake5 1.0
 
+    # special case
+    if { ${subport} eq "${name}-qtwebkit" } {
+        PortGroup cxx11 1.0
+
+        # in ${worksrcdir}/Source/JavaScriptCore/API/JSBase.h, JSC_OBJC_API_ENABLED is set to FALSE for __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+        # the default for Qt is to set -mmacosx-version-min=10.7, so JSC_OBJC_API_ENABLED is expected to be FALSE
+        # if QMAKE_MACOSX_DEPLOYMENT_TARGET is changed, then JSC_OBJC_API_ENABLED is TRUE and
+        # ${worksrcdir}/Source/JavaScriptCore/API/ObjCCallbackFunction.h attempts to find JavaScriptCore/JSCallbackFunction.h, which it can not
+        configure.args-delete QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
+
+        # -mmacosx-version-min=10.7 sets the stdlib to libstdc++ unless -stdlib=libc++ is set
+        # QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib} is insufficient since order of switches matters
+        configure.args-delete \
+            QMAKE_CXXFLAGS_CXX11-=-stdlib=libc++ \
+            QMAKE_LFLAGS_CXX11-=-stdlib=libc++
+    }
+
     # accommodating variant request varies depending on how qtbase was built
     pre-configure {
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160109/7ccdce0a/attachment.html>