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

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

qt4-mac :

  • bump to 4.8.3_0;
  • disable +framework variant; always install as framework, and use symlinks to populate libraries and headers into ${prefix}/lib and ${prefix}/include;
  • correct patches to work with new version;
  • remove old 10.8 patchfile, and replace with the single remaining patch needed for linking corelib;
  • install private headers for some Qt modules to allow other ports to work fully (e.g., qt4-creator-mac).
File size: 10.8 KB
  • configure

    old new  
    920920QT_INSTALL_DOCS=
    921921QT_INSTALL_HEADERS=
    922922QT_INSTALL_LIBS=
     923QT_INSTALL_FRAMEWORKS=
    923924QT_INSTALL_BINS=
    924925QT_INSTALL_PLUGINS=
    925926QT_INSTALL_IMPORTS=
     
    13801381    libdir)
    13811382        QT_INSTALL_LIBS="$VAL"
    13821383        ;;
     1384    frameworkdir)
     1385        QT_INSTALL_FRAMEWORKS="$VAL"
     1386        ;;
    13831387    qtnamespace)
    13841388        QT_NAMESPACE="$VAL"
    13851389        ;;
     
    36973701    fi
    36983702    QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
    36993703
     3704    #frameworks
     3705    if [ -z "$QT_INSTALL_FRAMEWORKS" ]; then #default
     3706        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
     3707            if [ "$PLATFORM_MAC" = "yes" ]; then
     3708                if [ "$CFG_FRAMEWORK" = "yes" ]; then
     3709                    QT_INSTALL_FRAMEWORKS="/Libraries/Frameworks"
     3710                fi
     3711            fi
     3712        fi
     3713        [ -z "$QT_INSTALL_FRAMEWORKS" ] && QT_INSTALL_FRAMEWORKS="$QT_INSTALL_PREFIX/Library/Frameworks" #fallback
     3714    fi
     3715    QT_INSTALL_FRAMEWORKS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_FRAMEWORKS"`
     3716
    37003717    #bins
    37013718    if [ -z "$QT_INSTALL_BINS" ]; then #default
    37023719        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
     
    47524769DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    47534770HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
    47544771LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
     4772FRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_INSTALL_FRAMEWORKS"`
    47554773BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
    47564774PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    47574775IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
     
    47774795    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    47784796    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
    47794797    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
     4798    HOSTFRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_HOST_PREFIX/Library/Frameworks"`
    47804799    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
    47814800    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    47824801    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
     
    47944813static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    47954814static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
    47964815static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
     4816static const char qt_configure_frameworks_path_str   [256 + 12] = "$HOSTFRAMEWORKS_PATH_STR";
    47974817static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
    47984818static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    47994819static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
     
    48124832static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    48134833static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
    48144834static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
     4835static const char qt_configure_frameworks_path_str   [256 + 18] = "$FRAMEWORKS_PATH_STR";
    48154836static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
    48164837static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    48174838static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
     
    48374858#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    48384859#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
    48394860#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
     4861#define QT_CONFIGURE_FRAMEWORKS_PATH qt_configure_frameworks_path_str + 18;
    48404862#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
    48414863#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    48424864#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
     
    49965018            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    49975019            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
    49985020            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
    4999             if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
    5000                 X86_CFLAGS="-arch i386"
    5001                 X86_LFLAGS="-arch i386"
    5002                 EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
    5003                 EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
    5004                 EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
    5005             fi
    5006             if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
    5007                 PPC_CFLAGS="-arch ppc"
    5008                 PPC_LFLAGS="-arch ppc"
    5009                 EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
    5010                 EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
    5011                 EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
    5012             fi
     5021           ARCH_CFLAGS="-arch @ARCHES@"
     5022           ARCH_LFLAGS="-arch @ARCHES@"
     5023           EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
     5024           EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
     5025           EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
    50135026            if [ '!' -z "$CFG_SDK" ]; then
    50145027                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    50155028                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
     
    54415454        psql)
    54425455            if [ "$CFG_SQL_psql" != "no" ]; then
    54435456                # Be careful not to use native pg_config when cross building.
    5444                 if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
    5445                     QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
    5446                     QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
     5457                if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" @PATH_TO_PG_CONFIG@pg_config >/dev/null 2>&1; then
     5458                    QT_CFLAGS_PSQL=`@PATH_TO_PG_CONFIG@pg_config --includedir 2>/dev/null`
     5459                    QT_LFLAGS_PSQL=`@PATH_TO_PG_CONFIG@pg_config --libdir 2>/dev/null`
    54475460                fi
    54485461                [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
    54495462                [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
     
    70977110
    70987111# set the global Mac deployment target. This is overridden on an arch-by-arch basis
    70997112# in some cases, see code further down
    7100 case "$PLATFORM,$CFG_MAC_COCOA" in
    7101     macx*,yes)
    7102         # Cocoa
    7103         QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
    7104         ;;
    7105     macx*,no)
    7106         # gcc, Carbon
    7107         QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
    7108         ;;
    7109 esac
     7113
     7114QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
    71107115
    71117116# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    71127117case "$XPLATFORM" in
     
    78447849# env. variable.
    78457850if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
    78467851    if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
    7847         QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7848         QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7849         QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
    7850         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
     7852        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7853        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7854        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7855        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    78517856    fi
    78527857    if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
    7853         QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7854         QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7855         QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
    7856         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
     7858        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7859        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7860        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7861        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    78577862    fi
    78587863    if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
    7859         QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7860         QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7861         QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
    7862         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
     7864        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7865        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7866        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7867        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    78637868    fi
    78647869    if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
    7865         QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    7866         QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    7867         QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
    7868         QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
     7870        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7871        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7872        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
     7873        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
    78697874    fi
    78707875fi
    78717876
     
    86188623QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    86198624QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
    86208625QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
     8626QMAKE_FRAMEWORKDIR_QT = \$\$QT_BUILD_TREE/Library/Frameworks
    86218627QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
    86228628
    86238629EOF
Note: See TracBrowser for help on using the repository browser.