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
RevLine 
[113176]1--- configure.orig      2013-11-11 12:18:47.000000000 -0500
2+++ configure   2013-11-11 12:21:48.000000000 -0500
[107841]3@@ -924,12 +924,14 @@
[102010]4 CFG_ICU=auto
5 CFG_SYSTEM_PROXIES=no
6 CFG_SLOG2=auto
7+CFG_CXX11=no
8 
9 # initalize variables used for installation
10 QT_INSTALL_PREFIX=
[92720]11 QT_INSTALL_DOCS=
12 QT_INSTALL_HEADERS=
13 QT_INSTALL_LIBS=
14+QT_INSTALL_FRAMEWORKS=
15 QT_INSTALL_BINS=
16 QT_INSTALL_PLUGINS=
17 QT_INSTALL_IMPORTS=
[107841]18@@ -1143,7 +1145,7 @@
[102010]19         VAL=no
20         ;;
21     #Qt style yes options
22-    -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)
23+    -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)
24         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
25         VAL=yes
26         ;;
[107841]27@@ -1398,6 +1400,9 @@
[92720]28     libdir)
29         QT_INSTALL_LIBS="$VAL"
30         ;;
31+    frameworkdir)
32+        QT_INSTALL_FRAMEWORKS="$VAL"
33+        ;;
34     qtnamespace)
35         QT_NAMESPACE="$VAL"
36         ;;
[107841]37@@ -2515,6 +2520,13 @@
[102010]38             UNKNOWN_OPT=yes
39         fi
40         ;;
41+    c++11)
42+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
43+            CFG_CXX11="$VAL"
44+        else
45+            UNKNOWN_OPT=yes
46+        fi
47+        ;;
48     system-proxies)
49         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
50             CFG_SYSTEM_PROXIES="$VAL"
[107841]51@@ -3450,6 +3462,53 @@
[102339]52     CFG_MAC_XARCH=no
53 fi
54 
55+# detect required support for CPATH
56+if "$mactests/cpath/cpath.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/cpath" ; then
57+    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."
58+    exit 1
59+fi
60+
[102344]61+# detect required support for LIBRARY_PATH
62+if "$mactests/library_path/library_path.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/library_path" ; then
63+    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."
64+    exit 1
65+fi
66+
[102339]67+# detect required support for -fconstant-cfstrings
68+if "$mactests/fconstant_cfstrings.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
69+    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."
70+    exit 1
71+fi
72+
[102936]73+# detect required support for Objective-C blocks (^) on the mac,
74+# but only on 10.6 ("uname -r" == 10.X) and newer
75+case "$UNAME_SYSTEM:$UNAME_RELEASE" in
76+    Darwin:[0-9].*)
77+       ;;
78+    Darwin*)
79+       if "$mactests/objc_block/objc_block.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/objc_block" ; then
80+           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."
81+           exit 1
82+       fi
83+       ;;
84+    *)
85+       ;;
86+esac
[102339]87+
88+# Detect C++11 support, only if requested
89+if [ "$CFG_CXX11" = "yes" ]; then
90+    if "$mactests/c++11/c++11.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests/c++11" ; then
91+       echo >&2 "error: C++11 support was requested, but the compiler ($TEST_COMPILER) does not seem to support C++11."
92+        exit 1
93+    fi
94+fi
95+
96+# detect required support for -Xarch
97+if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
98+    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."
99+    exit 1
100+fi
101+
102 #auto-detect DWARF2 on the mac
103 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
[107841]104     if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
105@@ -3459,15 +3518,6 @@
[92720]106     fi
[102339]107 fi
108 
109-# auto-detect support for -Xarch on the mac
110-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then
111-    if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
112-        CFG_MAC_XARCH=no
113-    else
114-        CFG_MAC_XARCH=yes
115-    fi
116-fi
117-
118 # don't autodetect support for separate debug info on objcopy when
119 # cross-compiling as lots of toolchains seems to have problems with this
120 if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then
[107841]121@@ -3694,6 +3744,19 @@
[102339]122     fi
[92720]123     QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
124 
125+    #frameworks
126+    if [ -z "$QT_INSTALL_FRAMEWORKS" ]; then #default
127+        if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
128+           if [ "$PLATFORM_MAC" = "yes" ]; then
129+               if [ "$CFG_FRAMEWORK" = "yes" ]; then
130+                   QT_INSTALL_FRAMEWORKS="/Libraries/Frameworks"
131+                fi
132+            fi
133+        fi
134+        [ -z "$QT_INSTALL_FRAMEWORKS" ] && QT_INSTALL_FRAMEWORKS="$QT_INSTALL_PREFIX/Library/Frameworks" #fallback
135+    fi
136+    QT_INSTALL_FRAMEWORKS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_FRAMEWORKS"`
137+
138     #bins
139     if [ -z "$QT_INSTALL_BINS" ]; then #default
140         if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
[107841]141@@ -4761,6 +4824,7 @@
[92720]142 DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
143 HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
144 LIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_INSTALL_LIBS"`
145+FRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_INSTALL_FRAMEWORKS"`
146 BINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_INSTALL_BINS"`
147 PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
148 IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
[107841]149@@ -4786,6 +4850,7 @@
[92720]150     HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
151     HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
152     HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
153+    HOSTFRAMEWORKS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_frameworkspath=$QT_HOST_PREFIX/Library/Frameworks"`
154     HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
155     HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
156     HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
[107841]157@@ -4803,6 +4868,7 @@
[92720]158 static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
159 static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
160 static const char qt_configure_libraries_path_str    [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
161+static const char qt_configure_frameworks_path_str   [256 + 12] = "$HOSTFRAMEWORKS_PATH_STR";
162 static const char qt_configure_binaries_path_str     [256 + 12] = "$HOSTBINARIES_PATH_STR";
163 static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
164 static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
[107841]165@@ -4821,6 +4887,7 @@
[92720]166 static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
167 static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
168 static const char qt_configure_libraries_path_str    [256 + 12] = "$LIBRARIES_PATH_STR";
169+static const char qt_configure_frameworks_path_str   [256 + 18] = "$FRAMEWORKS_PATH_STR";
170 static const char qt_configure_binaries_path_str     [256 + 12] = "$BINARIES_PATH_STR";
171 static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
172 static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
[107841]173@@ -4846,6 +4913,7 @@
[92720]174 #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
175 #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
176 #define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12;
177+#define QT_CONFIGURE_FRAMEWORKS_PATH qt_configure_frameworks_path_str + 18;
178 #define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12;
179 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
180 #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
[113176]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)"
[107841]199@@ -5005,20 +5073,11 @@
[92720]200             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
201             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
202             EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
203-           if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
204-               X86_CFLAGS="-arch i386"
205-               X86_LFLAGS="-arch i386"
206-               EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
207-               EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
208-                EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
209-            fi
210-           if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
211-               PPC_CFLAGS="-arch ppc"
212-               PPC_LFLAGS="-arch ppc"
213-               EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
214-               EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
215-                EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
216-            fi
217+           ARCH_CFLAGS="-arch @ARCHES@"
218+           ARCH_LFLAGS="-arch @ARCHES@"
219+           EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
220+           EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
221+           EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
222            if [ '!' -z "$CFG_SDK" ]; then
223                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
224                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
[107841]225@@ -6957,7 +7016,7 @@
[92720]226 
[107841]227 # detect OpenVG support
228 if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
229-    if compileTest "unix/openvg" "OpenVG"; then
230+    if compileTest "unix/openvg" "OpenVG" $QMAKE_OPENVG_ARG; then
231         if [ "$CFG_OPENVG" = "auto" ]; then
232             CFG_OPENVG=yes
233         fi
234@@ -6988,7 +7047,7 @@
235             CFG_OPENVG=no
236         fi
237     fi
238-    if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $CONFIG_ARG; then
239+    if [ "$CFG_OPENVG" = "yes" ] && compileTest "unix/shivavg" "ShivaVG" $QMAKE_OPENVG_ARG; then
240         CFG_OPENVG_SHIVA=yes
241     fi
242 fi
243@@ -7179,16 +7238,8 @@
244 
[92720]245 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
246 # in some cases, see code further down
247-case "$PLATFORM,$CFG_MAC_COCOA" in
248-    macx*,yes)
249-       # Cocoa
250-       QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
251-       ;;
252-    macx*,no)
253-       # gcc, Carbon
254-       QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
255-       ;;
256-esac
257+
258+QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
259 
260 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
261 case "$XPLATFORM" in
[107841]262@@ -7467,6 +7518,10 @@
[102010]263     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GUI"
264 fi
265 
266+if [ "$CFG_CXX11" = "yes" ]; then
267+    QT_CONFIG="$QT_CONFIG c++11"
268+    QMAKE_CONFIG="$QMAKE_CONFIG c++11"
269+fi
270 
271 if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
272     #On Mac we implicitly link against libz, so we
[107841]273@@ -7930,28 +7985,32 @@
[92720]274 # env. variable.
275 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
276     if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
277-        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
278-        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
279-        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
280-        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
281+        QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
282+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
283+        QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[94298]284+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[102010]285+        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[92720]286     fi
287     if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
288-        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
289-        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
290-        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
291-        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
292+        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
293+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
294+        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[94298]295+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[102010]296+        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[92720]297     fi
298     if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
299-        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
300-        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
301-        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
302-        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
303+        QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
304+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
305+        QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[94298]306+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[102010]307+        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[92720]308     fi
309     if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
310-        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
311-        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
312-        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
313-        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
314+        QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
315+        QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
316+        QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[94298]317+        QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[102010]318+        QMakeVar add QMAKE_OBJECTIVE_CXXFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
[92720]319     fi
320 fi
321 
[107841]322@@ -8709,6 +8768,7 @@
[92720]323 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
324 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
325 QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
326+QMAKE_FRAMEWORKDIR_QT = \$\$QT_BUILD_TREE/Library/Frameworks
327 QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib
328 
329 EOF
[107841]330@@ -8747,6 +8807,11 @@
[102010]331     echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
332 fi
333 
334+#dump in the OPENVG_LIBS info
335+if [ "$CFG_OPENVG" = "yes" ]; then
336+   echo "QMAKE_LIBS_OPENVG = $QMAKE_OPENVG_ARG" >> "$CACHEFILE.tmp"
337+fi
338+
339 #dump in the OPENSSL_LIBS info
340 if [ '!' -z "$OPENSSL_LIBS" ]; then
341     echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
[107841]342@@ -8906,6 +8971,7 @@
[102010]343 else
344    echo "Debug .................. $CFG_DEBUG"
345 fi
346+echo "C++11 support .......... $CFG_CXX11"
347 echo "Qt 3 compatibility ..... $CFG_QT3SUPPORT"
348 [ "$CFG_DBUS" = "no" ]     && echo "QtDBus module .......... no"
349 [ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module .......... yes (run-time)"
Note: See TracBrowser for help on using the repository browser.