[102339] trunk/dports/aqua/qt4-mac
michaelld at macports.org
michaelld at macports.org
Thu Jan 31 07:08:18 PST 2013
Revision: 102339
https://trac.macports.org/changeset/102339
Author: michaelld at macports.org
Date: 2013-01-31 07:08:18 -0800 (Thu, 31 Jan 2013)
Log Message:
-----------
qt4-mac : compiler testing and comment changes only, so no rev-bump.
* move C++11 test, if variant is set, to pre-qmake build;
* add tests for CPATH, fconstant_cfstrings, and ObjC(++) blocks;
* patch configure to handle all of these tests, and error out if any fail;
* blacklist many compilers for not supplying required functionality;
* add macports-clang-3.0 back into non-C++11 support since it seems to honor CPATH;
* redo comments in Portfile to reflect the above changes, and tweak a couple comments for correctness.
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
trunk/dports/aqua/qt4-mac/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/aqua/qt4-mac/files/c++11/c++11.test
trunk/dports/aqua/qt4-mac/files/c++11/c++11_test.cpp
trunk/dports/aqua/qt4-mac/files/cpath/
trunk/dports/aqua/qt4-mac/files/cpath/cpath.test
trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.c
trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.h
trunk/dports/aqua/qt4-mac/files/fconstant_cfstrings.test
trunk/dports/aqua/qt4-mac/files/objc_block/
trunk/dports/aqua/qt4-mac/files/objc_block/objc_block.test
trunk/dports/aqua/qt4-mac/files/objc_block/objc_block_test.m
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/c++11/c++11.cpp
trunk/dports/aqua/qt4-mac/files/c++11/c++11.pro
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2013-01-31 14:34:52 UTC (rev 102338)
+++ trunk/dports/aqua/qt4-mac/Portfile 2013-01-31 15:08:18 UTC (rev 102339)
@@ -334,11 +334,11 @@
}
}
- # copy C++11 tests into place, if that variant is set
+ # copy C++11 files into place, if that variant is set
if {[variant_isset cxx11]} {
copy ${filespath}/c++11.prf ${worksrcpath}/mkspecs/features
- copy ${filespath}/c++11 ${worksrcpath}/config.tests/unix
+ copy ${filespath}/c++11 ${worksrcpath}/config.tests/mac
}
# copy Objective C / CXX files into place
@@ -348,23 +348,48 @@
copy ${filespath}/split_sources.prf \
${worksrcpath}/mkspecs/features/mac
+ # copy extra compiler tests into place; these are patched into the
+ # configure script to the area before qmake is built. If any
+ # fail, configure will fail quickly.
+
+ copy ${filespath}/fconstant_cfstrings.test \
+ ${worksrcpath}/config.tests/mac
+ copy ${filespath}/objc_block \
+ ${worksrcpath}/config.tests/mac
+ copy ${filespath}/cpath \
+ ${worksrcpath}/config.tests/mac
+
}
-# The build process uses -fconstant-cfstrings. configure.compiler
-# should therefore not be one of the MacPorts compilers unless it
-# supports this flag.
+# Block various compilers:
+#
+# * The build process requires -Xarch, -fconstant-cfstring, and
+# Objective-C(++) blocks (^), which are not supported with vanilla GCC
+# as installed by MacPorts but are supported by all versions of CLANG
+# (both MacPorts' and Apple's).
+#
+# * Some older versions of CLANG do not honor the CPATH or
+# LIBRARY_PATH environment variables, which are required for compiling
+# this port when using MacPorts. The versions seem to be: MacPorts
+# CLANG 2.9 or earlier, and Apple CLANG 318.0.58 or older.
+#
+# See also:
+# < http://llvm.org/bugs/show_bug.cgi?id=8971 >,
+# < https://trac.macports.org/ticket/30271 >,
+# < https://trac.macports.org/ticket/31076 >, and
+# < https://trac.macports.org/ticket/31638 >.
+#
+# NOTE: qt4-mac augments the standard Qt4 configure script with
+# pre-qmake-build tests for CPATH, -Xarch, -fconstant-cfstring,
+# Objective-C(++) blocks, and, if requested, C++11. The script will
+# error out quickly if the compiler does not seem to provide support
+# for any one of these properties, no matter this blacklist.
-# Some older versions of Clang do not honor CPATH or LIBRARY_PATH,
-# which are required for compiling this port. The versions seem to
-# be: MacPorts Clang 3.0 or earlier, and Apple Clang 318.0.58 or
-# older. Block these.
-# http://llvm.org/bugs/show_bug.cgi?id=8971, # #30271, #31076, #31638
+compiler.blacklist-append { clang <= 318.0.58 } \
+ macports-gcc-4.1 macports-gcc-4.2 macports-gcc-4.3 \
+ macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6 \
+ macports-gcc-4.7 macports-gcc-4.8 macports-clang-2.9
-compiler.blacklist \
- macports-clang-2.9 \
- macports-clang-3.0 \
- { clang <= 318.0.58 }
-
# --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
@@ -389,17 +414,18 @@
configure.cxx_archflags
configure.ld_archflags
-# use compiler.cpath and compiler.library_path, as per
-# http://trac.macports.org/ticket/25321 for all -I and -L entries,
-# so-as to avoid conflicts with already-installed headers and
-# libraries (giving preference to internal-to-this-port first)
+# Use compiler.cpath and compiler.library_path for all -I and -L
+# entries, so-as to avoid conflicts with already-installed headers and
+# libraries (giving preference to internal-to-this-port first). CPATH
+# is used instead of -I to avoid conflicts with other ports.
#
-# CPATH is used instead of -I to avoid conflicts with other ports.
-# See http://trac.macports.org/ticket/15219 and
-# http://trac.macports.org/ticket/18723.
-#
-# set the default paths to include those for SQLITE3 and DBUS-1
+# See also:
+# < https://trac.macports.org/ticket/15219 >,
+# < https://trac.macports.org/ticket/18723 >, and
+# < https://trac.macports.org/ticket/25321 >.
+# set the default paths to include those for SQLITE3 and DBUS-1
+
set header_path [ list ${prefix}/include/dbus-1.0 \
${prefix}/lib/dbus-1.0/include \
${prefix}/include ]
@@ -1016,9 +1042,17 @@
variant cxx11 description {Add library support for C++11 (EXPERIMENTAL)} {
+ # Block compilers that do not support C++11. This variant seems to
+ # work with MacPorts' clang 3.0 or newer and Apple clang newer
+ # than 318.0.58 (but, not that version, which is already blocked).
+
+ compiler.blacklist-append \
+ apple-gcc-4.0 apple-gcc-4.2 \
+ llvm-gcc-4.2 macports-clang-3.0
+
pre-extract {
- ui_msg "WARNING: You have enabled C++11 support for Qt4, which is EXPERIMENTAL. Qt's libraries and applications (not including QMake) will be compiled using C++11. That said, C++11 will NOT be enabled by default when using QMake. You can enable C++11 by specifying \'CONFIG += c++11\' in any QMake build file."
+ ui_msg "WARNING: You have enabled C++11 support for Qt4, which is EXPERIMENTAL. Qt's libraries and applications (not including QMake) will be compiled using C++11. That said, C++11 will NOT be enabled by default when using QMake. You can enable C++11 by specifying, e.g. \'CONFIG += c++11\', in any QMake build file."
}
Deleted: trunk/dports/aqua/qt4-mac/files/c++11/c++11.cpp
===================================================================
--- trunk/dports/aqua/qt4-mac/files/c++11/c++11.cpp 2013-01-31 14:34:52 UTC (rev 102338)
+++ trunk/dports/aqua/qt4-mac/files/c++11/c++11.cpp 2013-01-31 15:08:18 UTC (rev 102339)
@@ -1,12 +0,0 @@
-// from Qt 5.0
-
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#else
-# error "__cplusplus must be >= 201103L, or __GXX_EXPERIMENTAL_CXX0X__ must be defined"
-#endif
-
-constexpr int get_five() {return 5;}
-
-int some_value[get_five() + 7];
-
-int main(int, char **) { return 0; }
Deleted: trunk/dports/aqua/qt4-mac/files/c++11/c++11.pro
===================================================================
--- trunk/dports/aqua/qt4-mac/files/c++11/c++11.pro 2013-01-31 14:34:52 UTC (rev 102338)
+++ trunk/dports/aqua/qt4-mac/files/c++11/c++11.pro 2013-01-31 15:08:18 UTC (rev 102339)
@@ -1,3 +0,0 @@
-SOURCES = c++11.cpp
-CONFIG += c++11
-CONFIG -= qt app_bundle
Added: trunk/dports/aqua/qt4-mac/files/c++11/c++11.test
===================================================================
--- trunk/dports/aqua/qt4-mac/files/c++11/c++11.test (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/c++11/c++11.test 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+CXX11_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+cd $3
+
+if "$COMPILER" -std=c++11 -c c++11_test.cpp 2>/dev/null 1>&2; then
+ CXX11_SUPPORT=yes
+fi
+rm -f c++11_test.o
+
+if [ "$CXX11_SUPPORT" != "yes" ]; then
+ [ "$VERBOSE" = "yes" ] && echo "C++11 support not detected"
+ exit 0
+else
+ [ "$VERBOSE" = "yes" ] && echo "C++11 support detected"
+ exit 1
+fi
Property changes on: trunk/dports/aqua/qt4-mac/files/c++11/c++11.test
___________________________________________________________________
Added: svn:executable
+ *
Copied: trunk/dports/aqua/qt4-mac/files/c++11/c++11_test.cpp (from rev 102316, trunk/dports/aqua/qt4-mac/files/c++11/c++11.cpp)
===================================================================
--- trunk/dports/aqua/qt4-mac/files/c++11/c++11_test.cpp (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/c++11/c++11_test.cpp 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,12 @@
+// from Qt 5.0
+
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#else
+# error "__cplusplus must be >= 201103L, or __GXX_EXPERIMENTAL_CXX0X__ must be defined"
+#endif
+
+constexpr int get_five() {return 5;}
+
+int some_value[get_five() + 7];
+
+int main(int, char **) { return 0; }
Added: trunk/dports/aqua/qt4-mac/files/cpath/cpath.test
===================================================================
--- trunk/dports/aqua/qt4-mac/files/cpath/cpath.test (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/cpath/cpath.test 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+CPATH_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+cd $3
+export CPATH=.
+
+if "$COMPILER" -nostdinc -c cpath_test.c 2>/dev/null 1>&2; then
+ CPATH_SUPPORT=yes
+fi
+rm -f cpath_test.o
+
+if [ "$CPATH_SUPPORT" != "yes" ]; then
+ [ "$VERBOSE" = "yes" ] && echo "CPATH support not detected"
+ exit 0
+else
+ [ "$VERBOSE" = "yes" ] && echo "CPATH support detected"
+ exit 1
+fi
Property changes on: trunk/dports/aqua/qt4-mac/files/cpath/cpath.test
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.c
===================================================================
--- trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.c (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.c 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,8 @@
+#include <cpath_test.h>
+
+int test_cpath = 1;
+
+int main (void) {
+ (void) test_cpath;
+ return (0);
+}
Added: trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.h
===================================================================
--- trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.h (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/cpath/cpath_test.h 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1 @@
+extern int test_cpath;
Added: trunk/dports/aqua/qt4-mac/files/fconstant_cfstrings.test
===================================================================
--- trunk/dports/aqua/qt4-mac/files/fconstant_cfstrings.test (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/fconstant_cfstrings.test 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+FCONSTANT_CFSTRINGS_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+cd $3
+touch fconstant_cfstrings.c
+
+if "$COMPILER" -fconstant-cfstrings -c fconstant_cfstrings.c 2>/dev/null 1>&2; then
+ if "$COMPILER" -fconstant-cfstrings -c fconstant_cfstrings.c 2>&1 | grep "unrecognized" >/dev/null ; then
+ true
+ else
+ FCONSTANT_CFSTRINGS_SUPPORT=yes
+ fi
+fi
+rm -f fconstant_cfstrings.c fconstant_cfstrings.o
+
+if [ "$FCONSTANT_CFSTRINGS_SUPPORT" != "yes" ]; then
+ [ "$VERBOSE" = "yes" ] && echo "compiler flag -fconstant-cfstrings support not detected"
+ exit 0
+else
+ [ "$VERBOSE" = "yes" ] && echo "compiler flag -fconstant-cfstrings support detected"
+ exit 1
+fi
Property changes on: trunk/dports/aqua/qt4-mac/files/fconstant_cfstrings.test
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/aqua/qt4-mac/files/objc_block/objc_block.test
===================================================================
--- trunk/dports/aqua/qt4-mac/files/objc_block/objc_block.test (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/objc_block/objc_block.test 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+OBJC_BLOCK_SUPPORT=no
+COMPILER=$1
+VERBOSE=$2
+WORKDIR=$3
+
+cd $3
+
+if "$COMPILER" -c objc_block_test.m 2>/dev/null 1>&2; then
+ OBJC_BLOCK_SUPPORT=yes
+fi
+rm -f objc_block_test.o
+
+if [ "$OBJC_BLOCK_SUPPORT" != "yes" ]; then
+ [ "$VERBOSE" = "yes" ] && echo "Objective-C block (^) support not detected"
+ exit 0
+else
+ [ "$VERBOSE" = "yes" ] && echo "Objective-C block (^) support detected"
+ exit 1
+fi
Property changes on: trunk/dports/aqua/qt4-mac/files/objc_block/objc_block.test
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/aqua/qt4-mac/files/objc_block/objc_block_test.m
===================================================================
--- trunk/dports/aqua/qt4-mac/files/objc_block/objc_block_test.m (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/objc_block/objc_block_test.m 2013-01-31 15:08:18 UTC (rev 102339)
@@ -0,0 +1,10 @@
+double (^multiplyTwoValues)(double, double) =
+ ^(double firstValue, double secondValue) {
+ return firstValue * secondValue;
+};
+
+int main () {
+ double result = multiplyTwoValues(2,4);
+ (void) result;
+ return (0);
+}
Modified: trunk/dports/aqua/qt4-mac/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2013-01-31 14:34:52 UTC (rev 102338)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2013-01-31 15:08:18 UTC (rev 102339)
@@ -1,5 +1,5 @@
---- configure.orig 2013-01-20 15:22:24.000000000 -0500
-+++ configure 2013-01-22 15:50:39.000000000 -0500
+--- configure.orig 2013-01-30 20:33:36.000000000 -0500
++++ configure 2013-01-30 20:53:16.000000000 -0500
@@ -918,12 +918,14 @@
CFG_ICU=auto
CFG_SYSTEM_PROXIES=no
@@ -48,8 +48,63 @@
system-proxies)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_SYSTEM_PROXIES="$VAL"
-@@ -3685,6 +3697,19 @@
+@@ -3451,6 +3463,38 @@
+ CFG_MAC_XARCH=no
+ fi
+
++# detect required support for CPATH
++if "$mactests/cpath/cpath.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/cpath" ; then
++ 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."
++ exit 1
++fi
++
++# detect required support for -fconstant-cfstrings
++if "$mactests/fconstant_cfstrings.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
++ 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."
++ exit 1
++fi
++
++# detect required support for Objective-C blocks (^) on the mac
++if "$mactests/objc_block/objc_block.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/objc_block" ; then
++ 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."
++ exit 1
++fi
++
++# Detect C++11 support, only if requested
++if [ "$CFG_CXX11" = "yes" ]; then
++ if "$mactests/c++11/c++11.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/c++11" ; then
++ echo >&2 "error: C++11 support was requested, but the compiler ($TEST_COMPILER) does not seem to support C++11."
++ exit 1
++ fi
++fi
++
++# detect required support for -Xarch
++if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
++ 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."
++ exit 1
++fi
++
+ #auto-detect DWARF2 on the mac
+ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
+ if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+@@ -3460,15 +3504,6 @@
fi
+ fi
+
+-# auto-detect support for -Xarch on the mac
+-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then
+- if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+- CFG_MAC_XARCH=no
+- else
+- CFG_MAC_XARCH=yes
+- fi
+-fi
+-
+ # don't autodetect support for separate debug info on objcopy when
+ # cross-compiling as lots of toolchains seems to have problems with this
+ if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
+@@ -3685,6 +3720,19 @@
+ fi
QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
+ #frameworks
@@ -68,7 +123,7 @@
#bins
if [ -z "$QT_INSTALL_BINS" ]; then #default
if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
-@@ -4752,6 +4777,7 @@
+@@ -4752,6 +4800,7 @@
DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
@@ -76,7 +131,7 @@
BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
-@@ -4777,6 +4803,7 @@
+@@ -4777,6 +4826,7 @@
HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
@@ -84,7 +139,7 @@
HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
-@@ -4794,6 +4821,7 @@
+@@ -4794,6 +4844,7 @@
static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
@@ -92,7 +147,7 @@
static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
-@@ -4812,6 +4840,7 @@
+@@ -4812,6 +4863,7 @@
static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
@@ -100,7 +155,7 @@
static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
-@@ -4837,6 +4866,7 @@
+@@ -4837,6 +4889,7 @@
#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
@@ -108,7 +163,7 @@
#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
-@@ -4996,20 +5026,11 @@
+@@ -4996,20 +5049,11 @@
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
@@ -134,25 +189,8 @@
if [ '!' -z "$CFG_SDK" ]; then
echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
-@@ -5118,6 +5139,16 @@
- # tests that need qmake
- #-------------------------------------------------------------------------------
+@@ -7161,16 +7205,8 @@
-+# Detect C++11 support, only if requested
-+if [ "$CFG_CXX11" = "yes" ]; then
-+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/c++11 "c++11" $L_FLAGS $I_FLAGS $l_FLAGS; then
-+ CFG_CXX11=yes
-+ else
-+ echo "C++11 support was requested but the functionality test for C++11 failed!"
-+ exit 101
-+ fi
-+fi
-+
- # detect availability of float math.h functions
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
- CFG_USE_FLOATMATH=yes
-@@ -7161,16 +7192,8 @@
-
# set the global Mac deployment target. This is overridden on an arch-by-arch basis
# in some cases, see code further down
-case "$PLATFORM,$CFG_MAC_COCOA" in
@@ -170,7 +208,7 @@
# disable Qt 3 support on VxWorks, Symbian and INTEGRITY
case "$XPLATFORM" in
-@@ -7447,6 +7470,10 @@
+@@ -7447,6 +7483,10 @@
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
fi
@@ -181,7 +219,7 @@
if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
#On Mac we implicitly link against libz, so we
-@@ -7910,28 +7937,32 @@
+@@ -7910,28 +7950,32 @@
# env. variable.
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
@@ -230,7 +268,7 @@
fi
fi
-@@ -8689,6 +8720,7 @@
+@@ -8689,6 +8733,7 @@
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
@@ -238,7 +276,7 @@
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
EOF
-@@ -8727,6 +8759,11 @@
+@@ -8727,6 +8772,11 @@
echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
fi
@@ -250,7 +288,7 @@
#dump in the OPENSSL_LIBS info
if [ '!' -z "$OPENSSL_LIBS" ]; then
echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
-@@ -8886,6 +8923,7 @@
+@@ -8886,6 +8936,7 @@
else
echo "Debug .................. $CFG_DEBUG"
fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130131/f052d431/attachment-0001.html>
More information about the macports-changes
mailing list