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

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

qt4-mac:
+ update to 4.8.6;
+ remove libWebKitSystemInterfaceMavericks.a since it is no longer needed;
+ remove unused patches and fix those remaining;
+ whitepsace here and there;
+ remove unused variants and related code;
+ +cxx11 variant to not work with Clang/libc++; this has been fixed in the Qt5 series, but is not simple to back-port.

File size: 18.2 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"
     
    34563468    CFG_MAC_XARCH=no
    34573469fi
    34583470
     3471# detect required support for CPATH
     3472if "$mactests/cpath/cpath.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/cpath" ; then
     3473    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."
     3474    exit 1
     3475fi
     3476
     3477# detect required support for LIBRARY_PATH
     3478if "$mactests/library_path/library_path.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/library_path" ; then
     3479    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."
     3480    exit 1
     3481fi
     3482
     3483# detect required support for -fconstant-cfstrings
     3484if "$mactests/fconstant_cfstrings.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
     3485    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."
     3486    exit 1
     3487fi
     3488
     3489# detect required support for Objective-C blocks (^) on the mac,
     3490# but only on 10.6 ("uname -r" == 10.X) and newer
     3491case "$UNAME_SYSTEM:$UNAME_RELEASE" in
     3492    Darwin:[0-9].*)
     3493        ;;
     3494    Darwin*)
     3495        if "$mactests/objc_block/objc_block.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/objc_block" ; then
     3496            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."
     3497            exit 1
     3498        fi
     3499        ;;
     3500    *)
     3501        ;;
     3502esac
     3503
     3504# Detect C++11 support, only if requested
     3505if [ "$CFG_CXX11" = "yes" ]; then
     3506    if "$mactests/c++11/c++11.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/c++11" ; then
     3507        echo >&2 "error: C++11 support was requested, but the compiler ($TEST_COMPILER) does not seem to support C++11."
     3508        exit 1
     3509    fi
     3510fi
     3511
     3512# detect required support for -Xarch
     3513if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
     3514    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."
     3515    exit 1
     3516fi
     3517
    34593518#auto-detect DWARF2 on the mac
    34603519if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
    34613520    if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
     
    34653524    fi
    34663525fi
    34673526
    3468 # auto-detect support for -Xarch on the mac
    3469 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then
    3470     if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
    3471         CFG_MAC_XARCH=no
    3472     else
    3473         CFG_MAC_XARCH=yes
    3474     fi
    3475 fi
    3476 
    34773527# don't autodetect support for separate debug info on objcopy when
    34783528# cross-compiling as lots of toolchains seems to have problems with this
    34793529if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
     
    37003750    fi
    37013751    QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
    37023752
     3753    #frameworks
     3754    if [ -z "$QT_INSTALL_FRAMEWORKS" ]; then #default
     3755        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
     3756            if [ "$PLATFORM_MAC" = "yes" ]; then
     3757                if [ "$CFG_FRAMEWORK" = "yes" ]; then
     3758                    QT_INSTALL_FRAMEWORKS="/Libraries/Frameworks"
     3759                fi
     3760            fi
     3761        fi
     3762        [ -z "$QT_INSTALL_FRAMEWORKS" ] && QT_INSTALL_FRAMEWORKS="$QT_INSTALL_PREFIX/Library/Frameworks" #fallback
     3763    fi
     3764    QT_INSTALL_FRAMEWORKS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_FRAMEWORKS"`
     3765
    37033766    #bins
    37043767    if [ -z "$QT_INSTALL_BINS" ]; then #default
    37053768        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
     
    47684831DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    47694832HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
    47704833LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
     4834FRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_INSTALL_FRAMEWORKS"`
    47714835BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
    47724836PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    47734837IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
     
    47934857    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    47944858    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
    47954859    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
     4860    HOSTFRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_HOST_PREFIX/Library/Frameworks"`
    47964861    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
    47974862    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    47984863    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
     
    48104875static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    48114876static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
    48124877static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
     4878static const char qt_configure_frameworks_path_str   [256 + 12] = "$HOSTFRAMEWORKS_PATH_STR";
    48134879static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
    48144880static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    48154881static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
     
    48284894static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    48294895static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
    48304896static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
     4897static const char qt_configure_frameworks_path_str   [256 + 18] = "$FRAMEWORKS_PATH_STR";
    48314898static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
    48324899static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    48334900static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
     
    48534920#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    48544921#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
    48554922#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
     4923#define QT_CONFIGURE_FRAMEWORKS_PATH qt_configure_frameworks_path_str + 18;
    48564924#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
    48574925#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    48584926#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
     
    49655033        EXTRA_OBJS=
    49665034        EXTRA_SRCS=
    49675035        EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
    4968         EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
     5036        EXTRA_CXXFLAGS="$QMAKE_STDLIB \$(QMAKE_CXXFLAGS)"
    49695037        EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
    49705038
    49715039        if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
     
    50095077                # Avoid overriding the default configuration settings when building with clang/libc++
    50105078                ;;
    50115079            *)
    5012                 # For all other configurations require a minimum of 10.5
    5013                 echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
     5080                # For all other configurations require a minimum of @MACOSX_DEPLOYMENT_TARGET@
     5081                echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
    50145082                ;;
    50155083            esac
    50165084
     
    50215089            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    50225090            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
    50235091            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
    5024             if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
    5025                 X86_CFLAGS="-arch i386"
    5026                 X86_LFLAGS="-arch i386"
    5027                 EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
    5028                 EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
    5029                 EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
    5030             fi
    5031             if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
    5032                 PPC_CFLAGS="-arch ppc"
    5033                 PPC_LFLAGS="-arch ppc"
    5034                 EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
    5035                 EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
    5036                 EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
    5037             fi
     5092            ARCH_CFLAGS="-arch @ARCHES@"
     5093            ARCH_LFLAGS="-arch @ARCHES@"
     5094            EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
     5095            EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
     5096            EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
    50385097            if [ '!' -z "$CFG_SDK" ]; then
    50395098                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    50405099                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
     
    69977056
    69987057# detect OpenVG support
    69997058if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
    7000     if compileTest "unix/openvg" "OpenVG"; then
     7059    if compileTest "unix/openvg" "OpenVG" $QMAKE_OPENVG_ARG; then
    70017060        if [ "$CFG_OPENVG" = "auto" ]; then
    70027061            CFG_OPENVG=yes
    70037062        fi
     
    70287087            CFG_OPENVG=no
    70297088        fi
    70307089    fi
    7031     if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $CONFIG_ARG; then
     7090    if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $QMAKE_OPENVG_ARG; then
    70327091        CFG_OPENVG_SHIVA=yes
    70337092    fi
    70347093fi
     
    72197278
    72207279# set the global Mac deployment target. This is overridden on an arch-by-arch basis
    72217280# in some cases, see code further down
    7222 case "$PLATFORM,$CFG_MAC_COCOA" in
    7223 *macx-clang-libc++,yes)
    7224     # Avoid overriding the default configuration setting when building with clang/libc++
    7225     ;;
    7226 macx*,yes)
    7227     # Cocoa
    7228     QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
    7229     ;;
    7230 macx*,no)
    7231     # gcc, Carbon
    7232     QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
    7233     ;;
    7234 esac
     7281QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
    72357282
    72367283# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    72377284case "$XPLATFORM" in
     
    75107557    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
    75117558fi
    75127559
     7560if [ "$CFG_CXX11" = "yes" ]; then
     7561    QT_CONFIG="$QT_CONFIG c++11"
     7562    QMAKE_CONFIG="$QMAKE_CONFIG c++11"
     7563fi
    75137564
    75147565if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
    75157566    #On Mac we implicitly link against libz, so we
     
    79818032        ;;
    79828033    *)
    79838034        if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
    7984             QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7985             QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7986             QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7987             QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
     8035            QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8036            QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8037            QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8038            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8039            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    79888040        fi
    79898041        if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
    7990             QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7991             QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7992             QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7993             QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
     8042            QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8043            QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8044            QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8045            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8046            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    79948047        fi
    79958048        if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
    7996             QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7997             QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7998             QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7999             QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
     8049            QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8050            QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8051            QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8052            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8053            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    80008054        fi
    80018055        if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
    8002             QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    8003             QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    8004             QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    8005             QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
     8056            QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8057            QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8058            QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8059            QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     8060            QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    80068061        fi
    80078062        ;;
    80088063    esac
     
    87628817QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    87638818QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
    87648819QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
     8820QMAKE_FRAMEWORKDIR_QT = \$\$QT_BUILD_TREE/Library/Frameworks
    87658821QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
    87668822
    87678823EOF
     
    88008856    echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
    88018857fi
    88028858
     8859#dump in the OPENVG_LIBS info
     8860if [ "$CFG_OPENVG" = "yes" ]; then
     8861   echo "QMAKE_LIBS_OPENVG = $QMAKE_OPENVG_ARG" >> "$CACHEFILE.tmp"
     8862fi
     8863
    88038864#dump in the OPENSSL_LIBS info
    88048865if [ '!' -z "$OPENSSL_LIBS" ]; then
    88058866    echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
     
    89599020else
    89609021   echo "Debug .................. $CFG_DEBUG"
    89619022fi
     9023echo "C++11 support .......... $CFG_CXX11"
    89629024echo "Qt 3 compatibility ..... $CFG_QT3SUPPORT"
    89639025[ "$CFG_DBUS" = "no" ]     && echo "QtDBus module .......... no"
    89649026[ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module .......... yes (run-time)"
Note: See TracBrowser for help on using the repository browser.