blob: ab7746e61e5db8bdfa613972d58f5776fc5a0561 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
$NetBSD: patch-configure,v 1.3 2016/03/02 23:04:00 ryoon Exp $
* Don't use SDKs on OS X
* Add NetBSD/sparc{,64} support
--- configure.orig 2015-10-13 04:35:07.000000000 +0000
+++ configure
@@ -337,7 +337,6 @@ getQMakeConf()
{
if [ -z "$specvals" ]; then
specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"`
- if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
fi
getSingleQMakeVariable "$1" "$specvals"
}
@@ -346,7 +345,6 @@ getXQMakeConf()
{
if [ -z "$xspecvals" ]; then
xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"`
- if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
fi
getSingleQMakeVariable "$1" "$xspecvals"
}
@@ -2897,6 +2895,19 @@ if [ -z "$PLATFORM" ]; then
UNIX_SV:*)
PLATFORM=unixware-g++
;;
+ NetBSD:*:sparc)
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " NetBSD on SPARC"
+ fi
+ CFG_HOST_ARCH=sparc
+ ;;
+ NetBSD:*:sparc64)
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " NetBSD on SPARC64"
+ fi
+ CFG_HOST_ARCH=sparc
+ CFG_HOST_BITSIZE=64
+ ;;
QNX:*)
PLATFORM=unsupported/qnx-g++
;;
@@ -3471,11 +3482,11 @@ if [ "$CFG_USE_GOLD_LINKER" != "no" ]; t
fi
# auto-detect --enable-new-dtags support
-if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
- CFG_ENABLE_NEW_DTAGS=yes
-else
+#if linkerSupportsFlag $TEST_COMPILER --enable-new-dtags; then
+# CFG_ENABLE_NEW_DTAGS=yes
+#else
CFG_ENABLE_NEW_DTAGS=no
-fi
+#fi
# auto-detect -fstack-protector-strong support (for QNX only currently)
if [ "$XPLATFORM_QNX" = "yes" ]; then
@@ -4014,10 +4025,12 @@ if true; then ###[ '!' -f "$outpath/bin/
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
EXTRA_OBJS="$EXTRA_OBJS \
qsettings_mac.o \
+ qstring_mac.o \
qcore_mac.o \
qcore_mac_objc.o"
EXTRA_SRCS="$EXTRA_SRCS \
\"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
+ \"\$(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm\" \
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\""
fi
|
