Package: qt4-x11 / 4:4.8.7+dfsg-18

07_trust_dpkg-arch_over_uname-m.diff Patch series | download
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
author: Sune Vuorela
qt-bugs@ issue : N180631
Trolltech task ID : 181882

---
 configure |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

--- a/configure
+++ b/configure
@@ -247,7 +247,53 @@ DeviceVar()
 #-------------------------------------------------------------------------------
 
 # need that throughout the script
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+# This is a ugly hack that shouldn't be extended any more. New archs
+# should just use the default *) UNAME_MACHINE="$DPKG_ARCH" The current mappings
+# is for backwards compatibility with existing archs already released.
+DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
+case $DPKG_ARCH in 
+	amd64)
+		UNAME_MACHINE="x86_64"
+	;;
+	arm)
+		UNAME_MACHINE="armv4l"
+	;;
+	armel)
+		UNAME_MACHINE="armv5tel"
+	;;
+	hppa)
+		UNAME_MACHINE="parisc"
+	;;
+	hurd-i386)
+		UNAME_MACHINE="i686-AT386"
+	;;
+	i386)
+		UNAME_MACHINE="i686"
+	;;
+	kfreebsd-amd64)
+		UNAME_MACHINE="x86_64"
+	;;
+	kfreebsd-i386)
+		UNAME_MACHINE="i586"
+	;;
+	lpia)
+		UNAME_MACHINE="i686"
+	;;
+	mips*)
+		UNAME_MACHINE="mips"
+	;;
+	powerpc)
+		UNAME_MACHINE="ppc"
+	;;
+	ppc64el)
+		UNAME_MACHINE="ppc64le"
+	;;
+	*)
+		UNAME_MACHINE="$DPKG_ARCH"
+	;;
+
+
+esac
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown