[144445] trunk/dports

[mcalhoun at macports.org]

Revision: 144445
          https://trac.macports.org/changeset/144445
Author:   mcalhoun at macports.org
Date:     2016-01-08 16:52:10 -0800 (Fri, 08 Jan 2016)
Log Message:
-----------
qmake5 Portgroup: respect macosx_deployment_target and configure.cxx_stdlib values when building with qmake (fixes #50249)

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/qmake5-1.0.tcl
    trunk/dports/aqua/qt5/Portfile
    trunk/dports/devel/qbs/Portfile
    trunk/dports/devel/qt5-creator/Portfile
    trunk/dports/devel/svn2git/Portfile
    trunk/dports/science/gqrx/Portfile
    trunk/dports/textproc/gpsbabel/Portfile

Modified: trunk/dports/_resources/port1.0/group/qmake5-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qmake5-1.0.tcl	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/_resources/port1.0/group/qmake5-1.0.tcl	2016-01-09 00:52:10 UTC (rev 144445)
@@ -74,6 +74,21 @@
     }
 }
 
+# override QMAKE_MACOSX_DEPLOYMENT_TARGET set in ${prefix}/libexec/qt5/mkspecs/macx-clang/qmake.conf
+# see #50249
+configure.args-append QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
+
+# override C++11 flags set in ${prefix}/libexec/qt5/mkspecs/common/clang-mac.conf
+#    so value of ${configure.cxx_stdlib} can always be used
+configure.args-append \
+    QMAKE_CXXFLAGS_CXX11-=-stdlib=libc++ \
+    QMAKE_LFLAGS_CXX11-=-stdlib=libc++
+
+# ensure ${configure.cxx_stdlib} is used for C++ stdlib
+configure.args-append \
+    QMAKE_CXXFLAGS+=-stdlib=${configure.cxx_stdlib} \
+    QMAKE_LFLAGS+=-stdlib=${configure.cxx_stdlib}
+
 if {![info exists qt5_qmake_request_no_debug]} {
     variant debug description {Build both release and debug libraries} {}
 

Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/aqua/qt5/Portfile	2016-01-09 00:52:10 UTC (rev 144445)
@@ -770,6 +770,9 @@
         }
     }
 
+    if { ${version} eq "5.5.1" } {
+        incr revision 1
+    }
     PortGroup           qmake5 1.0
 
     # accommodating variant request varies depending on how qtbase was built

Modified: trunk/dports/devel/qbs/Portfile
===================================================================
--- trunk/dports/devel/qbs/Portfile	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/devel/qbs/Portfile	2016-01-09 00:52:10 UTC (rev 144445)
@@ -7,6 +7,7 @@
 name                qbs
 
 version             1.4.4
+revision            1
 categories          devel
 platforms           darwin
 license             LGPL-2.1

Modified: trunk/dports/devel/qt5-creator/Portfile
===================================================================
--- trunk/dports/devel/qt5-creator/Portfile	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/devel/qt5-creator/Portfile	2016-01-09 00:52:10 UTC (rev 144445)
@@ -13,6 +13,7 @@
 PortGroup           qmake5 1.0
 
 version             3.5.1
+revision            1
 categories          devel aqua
 platforms           darwin
 license             LGPL-2.1

Modified: trunk/dports/devel/svn2git/Portfile
===================================================================
--- trunk/dports/devel/svn2git/Portfile	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/devel/svn2git/Portfile	2016-01-09 00:52:10 UTC (rev 144445)
@@ -7,6 +7,7 @@
 
 github.setup        svn-all-fast-export svn2git d4ff0b27ef4046e5de7454737845d60e81772606
 version             20151201
+revision            1
 categories          devel
 platforms           darwin
 maintainers         ryandesign openmaintainer

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/science/gqrx/Portfile	2016-01-09 00:52:10 UTC (rev 144445)
@@ -22,6 +22,7 @@
 
     github.setup        csete gqrx 520bce2b1977b258e9dbd126a01bd1d27cf1e207
     version             20160106
+    revision            1
     checksums           rmd160 585bfea43be3a4fc98e0974611b26ce7c39193c2 \
                         sha256 a06baaed427b31dfc45dd315ebf452a3c4d464ef373603ee1fcf5ba4d2bdcaaf
 

Modified: trunk/dports/textproc/gpsbabel/Portfile
===================================================================
--- trunk/dports/textproc/gpsbabel/Portfile	2016-01-09 00:16:37 UTC (rev 144444)
+++ trunk/dports/textproc/gpsbabel/Portfile	2016-01-09 00:52:10 UTC (rev 144445)
@@ -6,6 +6,7 @@
 
 name                gpsbabel
 version             1.5.2
+revision            1
 categories          textproc comms
 license             GPL
 maintainers         nomaintainer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160108/82c6292e/attachment.html>