summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSune Vuorela <debian@pusling.com>2008-05-10 07:02:30 +0000
committerSune Vuorela <debian@pusling.com>2008-05-10 07:02:30 +0000
commit02afa1ae28378b1fdcb0acc392e6d060438dbdae (patch)
treedd4823476ced4307da8da5db2818cf5c025b1dde
parent2f8cd8f51f34b9eb4b6e19a75028ddb42e27e069 (diff)
downloadqt4-x11-02afa1ae28378b1fdcb0acc392e6d060438dbdae.tar.gz
describe what (not) to do when adding new archs
-rw-r--r--debian/patches/07_trust_dpkg-arch_over_uname-m.diff5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 276ebd6..4671553 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -2,11 +2,14 @@ author: Sune Vuorela
Reported to trolltech as N180631 - and task 181882
--- a/configure
+++ b/configure
-@@ -93,7 +93,47 @@
+@@ -93,7 +93,50 @@
#-------------------------------------------------------------------------------
# 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)