Changeset 113176 for trunk/dports/aqua


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.

Location:
trunk/dports/aqua/qt4-mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r112821 r113176  
    472472configure.universal_args-delete --disable-dependency-tracking
    473473
    474 ################################################################################
    475 # We do not want flags of any kind -- QT is smart enough to set up its own.    #
    476 ################################################################################
    477 
    478 configure.cflags
    479 configure.cppflags
    480 configure.cxxflags
    481 configure.ldflags
    482 
    483 configure.universal_cflags
    484 configure.universal_cppflags
    485 configure.universal_cxxflags
    486 configure.universal_ldflags
    487 
    488 configure.cc_archflags
    489 configure.cxx_archflags
    490 configure.ld_archflags
    491 
    492474# Use compiler.cpath and compiler.library_path for all -I and -L
    493475# entries, so-as to avoid conflicts with already-installed headers and
     
    624606    configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
    625607
     608    # set which stdlib to use; clang only; use configure.cxx_stdlib if
     609    # that exists, and otherwise use libc++ on 10.9 or libstdc++ on
     610    # 10.8 or earler.
     611
     612    if {[string match *clang* ${configure.compiler}]} {
     613        if {[info exists configure.cxx_stdlib]} {
     614            configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
     615        } elseif {${MINOR} = "9"} {
     616            configure.env-append QMAKE_STDLIB="-stdlib=libc++"
     617        } else {
     618            configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
     619        }
     620    }
    626621}
    627622
  • 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.