source: trunk/dports/aqua/qt4-mac/files/patch-configure.diff @ 113176

Last change on this file since 113176 was 113176, checked in by michaelld@…, 6 years ago

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 size: 17.9 KB
  • configure

    old new  
    924924CFG_ICU=auto
    925925CFG_SYSTEM_PROXIES=no
    926926CFG_SLOG2=auto
     927CFG_CXX11=no
    927928
    928929# initalize variables used for installation
    929930QT_INSTALL_PREFIX=
    930931QT_INSTALL_DOCS=
    931932QT_INSTALL_HEADERS=
    932933QT_INSTALL_LIBS=
     934QT_INSTALL_FRAMEWORKS=
    933935QT_INSTALL_BINS=
    934936QT_INSTALL_PLUGINS=
    935937QT_INSTALL_IMPORTS=
     
    11431145        VAL=no
    11441146        ;;
    11451147    #Qt style yes options
    1146     -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
     1148    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-c++11)
    11471149        VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
    11481150        VAL=yes
    11491151        ;;
     
    13981400    libdir)
    13991401        QT_INSTALL_LIBS="$VAL"
    14001402        ;;
     1403    frameworkdir)
     1404        QT_INSTALL_FRAMEWORKS="$VAL"
     1405        ;;
    14011406    qtnamespace)
    14021407        QT_NAMESPACE="$VAL"
    14031408        ;;
     
    25152520            UNKNOWN_OPT=yes
    25162521        fi
    25172522        ;;
     2523    c++11)
     2524        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
     2525            CFG_CXX11="$VAL"
     2526        else
     2527            UNKNOWN_OPT=yes
     2528        fi
     2529        ;;
    25182530    system-proxies)
    25192531        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
    25202532            CFG_SYSTEM_PROXIES="$VAL"
     
    34503462    CFG_MAC_XARCH=no
    34513463fi
    34523464
     3465# detect required support for CPATH
     3466if "$mactests/cpath/cpath.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/cpath" ; then
     3467    echo >&2 "error: The compiler ($TEST_COMPILER) does not seem to support the CPATH environment variable, which is required to compile qt4-mac using MacPorts when compiling on Mac OS X."
     3468    exit 1
     3469fi
     3470
     3471# detect required support for LIBRARY_PATH
     3472if "$mactests/library_path/library_path.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/library_path" ; then
     3473    echo >&2 "error: The compiler ($TEST_COMPILER) does not seem to support the LIBRARY_PATH environment variable, which is required to compile qt4-mac using MacPorts when compiling on Mac OS X."
     3474    exit 1
     3475fi
     3476
     3477# detect required support for -fconstant-cfstrings
     3478if "$mactests/fconstant_cfstrings.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
     3479    echo >&2 "error: The compiler ($TEST_COMPILER) does not seem to support the -fconstant-cfstrings flag, which is used extensively by the Qt build system when compiling on Mac OS X."
     3480    exit 1
     3481fi
     3482
     3483# detect required support for Objective-C blocks (^) on the mac,
     3484# but only on 10.6 ("uname -r" == 10.X) and newer
     3485case "$UNAME_SYSTEM:$UNAME_RELEASE" in
     3486    Darwin:[0-9].*)
     3487        ;;
     3488    Darwin*)
     3489        if "$mactests/objc_block/objc_block.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/objc_block" ; then
     3490            echo >&2 "error: The compiler ($TEST_COMPILER) does not seem to support the Objective-C blocks (^), which are used by Qt when compiling on Mac OS X 10.6 and newer."
     3491            exit 1
     3492        fi
     3493        ;;
     3494    *)
     3495        ;;
     3496esac
     3497
     3498# Detect C++11 support, only if requested
     3499if [ "$CFG_CXX11" = "yes" ]; then
     3500    if "$mactests/c++11/c++11.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/c++11" ; then
     3501        echo >&2 "error: C++11 support was requested, but the compiler ($TEST_COMPILER) does not seem to support C++11."
     3502        exit 1
     3503    fi
     3504fi
     3505
     3506# detect required support for -Xarch
     3507if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
     3508    echo >&2 "error: The compiler ($TEST_COMPILER) does not seem to support the -Xarch flag, which is used extensively by the Qt build system when compiling on Mac OS X."
     3509    exit 1
     3510fi
     3511
    34533512#auto-detect DWARF2 on the mac
    34543513if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
    34553514    if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
     
    34593518    fi
    34603519fi
    34613520
    3462 # auto-detect support for -Xarch on the mac
    3463 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then
    3464     if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
    3465         CFG_MAC_XARCH=no
    3466     else
    3467         CFG_MAC_XARCH=yes
    3468     fi
    3469 fi
    3470 
    34713521# don't autodetect support for separate debug info on objcopy when
    34723522# cross-compiling as lots of toolchains seems to have problems with this
    34733523if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
     
    36943744    fi
    36953745    QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
    36963746
     3747    #frameworks
     3748    if [ -z "$QT_INSTALL_FRAMEWORKS" ]; then #default
     3749        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
     3750            if [ "$PLATFORM_MAC" = "yes" ]; then
     3751                if [ "$CFG_FRAMEWORK" = "yes" ]; then
     3752                    QT_INSTALL_FRAMEWORKS="/Libraries/Frameworks"
     3753                fi
     3754            fi
     3755        fi
     3756        [ -z "$QT_INSTALL_FRAMEWORKS" ] && QT_INSTALL_FRAMEWORKS="$QT_INSTALL_PREFIX/Library/Frameworks" #fallback
     3757    fi
     3758    QT_INSTALL_FRAMEWORKS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_FRAMEWORKS"`
     3759
    36973760    #bins
    36983761    if [ -z "$QT_INSTALL_BINS" ]; then #default
    36993762        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
     
    47614824DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    47624825HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
    47634826LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
     4827FRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_INSTALL_FRAMEWORKS"`
    47644828BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
    47654829PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    47664830IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
     
    47864850    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    47874851    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
    47884852    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
     4853    HOSTFRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_HOST_PREFIX/Library/Frameworks"`
    47894854    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
    47904855    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    47914856    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
     
    48034868static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    48044869static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
    48054870static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
     4871static const char qt_configure_frameworks_path_str   [256 + 12] = "$HOSTFRAMEWORKS_PATH_STR";
    48064872static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
    48074873static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    48084874static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
     
    48214887static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    48224888static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
    48234889static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
     4890static const char qt_configure_frameworks_path_str   [256 + 18] = "$FRAMEWORKS_PATH_STR";
    48244891static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
    48254892static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    48264893static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
     
    48464913#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    48474914#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
    48484915#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
     4916#define QT_CONFIGURE_FRAMEWORKS_PATH qt_configure_frameworks_path_str + 18;
    48494917#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
    48504918#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    48514919#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
     
    49585026        EXTRA_OBJS=
    49595027        EXTRA_SRCS=
    49605028        EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
    4961         EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
     5029        EXTRA_CXXFLAGS="$QMAKE_STDLIB \$(QMAKE_CXXFLAGS)"
    49625030        EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
    49635031
    49645032        if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
     
    49975065            done
    49985066        fi
    49995067        if [ "$BUILD_ON_MAC" = "yes" ]; then
    5000             echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
     5068            echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
    50015069            echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
    50025070            echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
    50035071            EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
     
    50055073            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    50065074            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
    50075075            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
    5008             if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
    5009                 X86_CFLAGS="-arch i386"
    5010                 X86_LFLAGS="-arch i386"
    5011                 EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
    5012                 EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
    5013                 EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
    5014             fi
    5015             if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
    5016                 PPC_CFLAGS="-arch ppc"
    5017                 PPC_LFLAGS="-arch ppc"
    5018                 EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
    5019                 EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
    5020                 EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
    5021             fi
     5076           ARCH_CFLAGS="-arch @ARCHES@"
     5077           ARCH_LFLAGS="-arch @ARCHES@"
     5078           EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
     5079           EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
     5080           EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
    50225081            if [ '!' -z "$CFG_SDK" ]; then
    50235082                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    50245083                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
     
    69577016
    69587017# detect OpenVG support
    69597018if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
    6960     if compileTest "unix/openvg" "OpenVG"; then
     7019    if compileTest "unix/openvg" "OpenVG" $QMAKE_OPENVG_ARG; then
    69617020        if [ "$CFG_OPENVG" = "auto" ]; then
    69627021            CFG_OPENVG=yes
    69637022        fi
     
    69887047            CFG_OPENVG=no
    69897048        fi
    69907049    fi
    6991     if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $CONFIG_ARG; then
     7050    if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $QMAKE_OPENVG_ARG; then
    69927051        CFG_OPENVG_SHIVA=yes
    69937052    fi
    69947053fi
     
    71797238
    71807239# set the global Mac deployment target. This is overridden on an arch-by-arch basis
    71817240# in some cases, see code further down
    7182 case "$PLATFORM,$CFG_MAC_COCOA" in
    7183     macx*,yes)
    7184         # Cocoa
    7185         QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
    7186         ;;
    7187     macx*,no)
    7188         # gcc, Carbon
    7189         QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
    7190         ;;
    7191 esac
     7241
     7242QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
    71927243
    71937244# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    71947245case "$XPLATFORM" in
     
    74677518    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
    74687519fi
    74697520
     7521if [ "$CFG_CXX11" = "yes" ]; then
     7522    QT_CONFIG="$QT_CONFIG c++11"
     7523    QMAKE_CONFIG="$QMAKE_CONFIG c++11"
     7524fi
    74707525
    74717526if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
    74727527    #On Mac we implicitly link against libz, so we
     
    79307985# env. variable.
    79317986if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
    79327987    if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
    7933         QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7934         QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7935         QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7936         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
     7988        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7989        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7990        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7991        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7992        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    79377993    fi
    79387994    if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
    7939         QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7940         QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7941         QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7942         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
     7995        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7996        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7997        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7998        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7999        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    79438000    fi
    79448001    if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
    7945         QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7946         QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7947         QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7948         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
     8002        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8003        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8004        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8005        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8006        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    79498007    fi
    79508008    if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
    7951         QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    7952         QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    7953         QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    7954         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
     8009        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8010        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8011        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8012        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8013        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    79558014    fi
    79568015fi
    79578016
     
    87098768QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    87108769QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
    87118770QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
     8771QMAKE_FRAMEWORKDIR_QT = \$\$QT_BUILD_TREE/Library/Frameworks
    87128772QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
    87138773
    87148774EOF
     
    87478807    echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
    87488808fi
    87498809
     8810#dump in the OPENVG_LIBS info
     8811if [ "$CFG_OPENVG" = "yes" ]; then
     8812   echo "QMAKE_LIBS_OPENVG = $QMAKE_OPENVG_ARG" >> "$CACHEFILE.tmp"
     8813fi
     8814
    87508815#dump in the OPENSSL_LIBS info
    87518816if [ '!' -z "$OPENSSL_LIBS" ]; then
    87528817    echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
     
    89068971else
    89078972   echo "Debug .................. $CFG_DEBUG"
    89088973fi
     8974echo "C++11 support .......... $CFG_CXX11"
    89098975echo "Qt 3 compatibility ..... $CFG_QT3SUPPORT"
    89108976[ "$CFG_DBUS" = "no" ]     && echo "QtDBus module .......... no"
    89118977[ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module .......... yes (run-time)"
Note: See TracBrowser for help on using the repository browser.