blob: 39d095d7a0362f6ab2607137fcd130391c351a3a (
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
|
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- qt-x11-opensource-src-4.0.1/configure~cross-compile
+++ qt-x11-opensource-src-4.0.1/configure
@@ -477,7 +477,7 @@
UNKNOWN_ARG=yes
fi
;;
- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-crossarch)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL=$1
@@ -768,6 +768,9 @@
xplatform)
XPLATFORM="$VAL"
;;
+ crossarch)
+ CROSSARCH="$VAL"
+ ;;
debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
@@ -1649,100 +1652,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
- ;;
- 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*:sun4*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Sun SPARC (sparc)"
- fi
- ARCH=sparc
- ;;
- Darwin:*:Power?Macintosh)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Apple PowerPC (powerpc)"
- fi
- ARCH=powerpc
- ;;
- Darwin:*:x86)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Apple Intel (x86)"
- fi
- ARCH=i386
- ;;
- 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)
- 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
- ;;
- *:*:*)
- 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'"
|
