blob: 7c8665c9c169d2bdcd399f919783510bd9cb8398 (
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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- qt-x11-opensource-src-4.1.1/configure~cross-compile
+++ qt-x11-opensource-src-4.1.1/configure
@@ -534,7 +534,7 @@
UNKNOWN_ARG=yes
fi
;;
- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk)
+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-crossarch)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL=$1
@@ -845,6 +845,9 @@
xplatform)
XPLATFORM="$VAL"
;;
+ crossarch)
+ CROSSARCH="$VAL"
+ ;;
debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
@@ -1698,131 +1701,7 @@
echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
fi
-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
- case "$CFG_EMBEDDED" in
- x86)
- ARCH=i386
- ;;
- x86_64)
- ARCH=x86_64
- ;;
- ipaq|sharp)
- ARCH=arm
- ;;
- *)
- ARCH="$CFG_EMBEDDED"
- ;;
- esac
-else
- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
- IRIX*:*:*)
- ARCH=`uname -p`
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " SGI ($ARCH)"
- fi
- ;;
- SunOS:5*:*)
- case "$UNAME_MACHINE" in
- sun4u)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Sun SPARC (sparc)"
- fi
- ARCH=sparc
- ;;
- i86pc)
- case "$PLATFORM" in
- *-64)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 64-bit AMD 80x86 (x86_64)"
- fi
- ARCH=x86_64
- ;;
- *)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Intel 80x86 (i386)"
- fi
- ARCH=i386
- ;;
- esac
- esac
- ;;
- Darwin:*:*)
- case "$UNAME_MACHINE" in
- Power?Macintosh)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Apple PowerPC (powerpc)"
- fi
- ;;
- x86)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Intel 80x86 (i386)"
- fi
- ;;
- esac
- ARCH=macosx
- ;;
- AIX:*:00????????00)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 64-bit IBM PowerPC (powerpc)"
- fi
- ARCH=powerpc
- ;;
- HP-UX:*:9000*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " HP PA-RISC (parisc)"
- fi
- ARCH=parisc
- ;;
- *:*:i?86)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Intel 80x86 (i386)"
- fi
- ARCH=i386
- ;;
- *:*:x86_64|*:*:amd64)
- if [ "$PLATFORM" = "linux-g++-32" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32 bit on 64-bit AMD 80x86 (i386)"
- fi
- ARCH=i386
- else
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 64-bit AMD 80x86 (x86_64)"
- fi
- ARCH=x86_64
- fi
- ;;
- *:*:ppc)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit PowerPC (powerpc)"
- fi
- ARCH=powerpc
- ;;
- *:*:s390*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " IBM S/390 (s390)"
- fi
- ARCH=s390
- ;;
- *:*:*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Trying '$UNAME_MACHINE'..."
- fi
- ARCH="$UNAME_MACHINE"
- ;;
- esac
-fi
-
-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$ARCH' is supported"
- fi
-else
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$ARCH' is unsupported, using 'generic'"
- fi
- ARCH=generic
-fi
+ARCH="$CROSSARCH"
if [ "$OPT_VERBOSE" = "yes" ]; then
echo "System architecture: '$ARCH'"
|
