Ignore:
Timestamp:
Nov 11, 2013, 6:23:50 PM (6 years ago)
Author:
michaelld@…
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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r107841 r113176  
    1 --- configure.orig      2013-07-06 19:48:02.000000000 -0400
    2 +++ configure   2013-07-06 19:51:14.000000000 -0400
     1--- configure.orig      2013-11-11 12:18:47.000000000 -0500
     2+++ configure   2013-11-11 12:21:48.000000000 -0500
    33@@ -924,12 +924,14 @@
    44 CFG_ICU=auto
     
    179179 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    180180 #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
     181@@ -4958,7 +5026,7 @@
     182         EXTRA_OBJS=
     183         EXTRA_SRCS=
     184         EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
     185-        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
     186+        EXTRA_CXXFLAGS="$QMAKE_STDLIB \$(QMAKE_CXXFLAGS)"
     187         EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
     188 
     189         if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
     190@@ -4997,7 +5065,7 @@
     191             done
     192         fi
     193         if [ "$BUILD_ON_MAC" = "yes" ]; then
     194-            echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
     195+            echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
     196             echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
     197             echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
     198             EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
    181199@@ -5005,20 +5073,11 @@
    182200             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
Note: See TracChangeset for help on using the changeset viewer.