On OS X, fix buiding with -stdlib=libc++

4 files changed, 46 insertions, 6 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 2d3355a6464..8153a5d870f 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2015/07/08 17:49:49 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2015/07/18 11:11:53 adam Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
 COMMENT=	C++ X GUI toolkit
@@ -28,9 +28,9 @@ CONFIGURE_ARGS+=	-openssl-linked
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CXXFLAGS+=	-std=c++11 -Wno-c++11-narrowing
-.if empty(MACHINE_PLATFORM:MDarwin-*-*)
+.  if empty(MACHINE_PLATFORM:MDarwin-*-*)
 CXXFLAGS+=	-D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
-.endif
+.  endif
 .endif
 
 INSTALLATION_DIRS=	lib/pkgconfig
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 454ce5a688e..15177068a2a 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.101 2015/07/08 17:49:49 wiz Exp $
+$NetBSD: distinfo,v 1.102 2015/07/18 11:11:53 adam Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -19,7 +19,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
 SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 587adf2777f1b915c410908c08c6ba62034b89ec
+SHA1 (patch-aq) = 3f2755b26f31536cbda36cbbc1795bcd882c6b59
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
@@ -71,3 +71,4 @@ SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191f
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
 SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
+SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = ba6f4facabb621388f38ee95f31e8d6f797ae12a
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index 2fae2505ea8..ee67ecb7be5 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.16 2015/07/08 17:49:49 wiz Exp $
+$NetBSD: patch-aq,v 1.17 2015/07/18 11:11:53 adam Exp $
 
 --- configure.orig	2015-05-07 14:14:56.000000000 +0000
 +++ configure
@@ -47,6 +47,15 @@ $NetBSD: patch-aq,v 1.16 2015/07/08 17:49:49 wiz Exp $
          echo
          echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
          echo
+@@ -5009,7 +5022,7 @@ if true; then ###[ '!' -f "$outpath/bin/
+         fi
+         if [ "$BUILD_ON_MAC" = "yes" ]; then
+             case "$PLATFORM" in
+-            *macx-clang-libc++)
++            *macx-llvm)
+                 # Avoid overriding the default configuration settings when building with clang/libc++
+                 ;;
+             *)
 @@ -5078,7 +5091,7 @@ if true; then ###[ '!' -f "$outpath/bin/
      done
  
@@ -65,6 +74,15 @@ $NetBSD: patch-aq,v 1.16 2015/07/08 17:49:49 wiz Exp $
          CFG_MAC_COCOA="no";
          CFG_MAC_CARBON="yes";
      fi
+@@ -7225,7 +7238,7 @@ fi
+ # set the global Mac deployment target. This is overridden on an arch-by-arch basis
+ # in some cases, see code further down
+ case "$PLATFORM,$CFG_MAC_COCOA" in
+-*macx-clang-libc++,yes)
++*macx-llvm,yes)
+     # Avoid overriding the default configuration setting when building with clang/libc++
+     ;;
+ macx*,yes)
 @@ -7713,7 +7726,7 @@ case "$XPLATFORM" in
  
  	# Check gcc's version
@@ -74,6 +92,15 @@ $NetBSD: patch-aq,v 1.16 2015/07/08 17:49:49 wiz Exp $
  		;;
  	    3.4*)
  		canBuildQtXmlPatterns="no"
+@@ -7981,7 +7994,7 @@ fi
+ # env. variable.
+ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ]; then
+     case "$PLATFORM" in
+-    *macx-clang-libc++)
++    *macx-llvm)
+         # Avoid overriding the default settings when building clang/libc++.
+         ;;
+     *)
 @@ -8485,7 +8498,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
  [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
  [ "$CFG_IPV6" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
diff --git a/x11/qt4-libs/patches/patch-src_tools_bootstrap_bootstrap.pro b/x11/qt4-libs/patches/patch-src_tools_bootstrap_bootstrap.pro
new file mode 100644
index 00000000000..2b8e0a7e315
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_tools_bootstrap_bootstrap.pro
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.1 2015/07/18 11:11:53 adam Exp $
+
+--- src/tools/bootstrap/bootstrap.pro.orig	2015-05-07 14:14:44.000000000 +0000
++++ src/tools/bootstrap/bootstrap.pro
+@@ -103,7 +103,6 @@ else:unix:SOURCES += ../../corelib/tools
+ else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp
+ 
+ macx: {
+-   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
+    SOURCES += ../../corelib/kernel/qcore_mac.cpp
+    LIBS += -framework CoreServices -framework ApplicationServices
+ }