qt4-x11 (4:4.8.5+dfsg-2+dyson1)dyson/4.8.5+dfsg-2+dyson1

  * Package for Dyson
    - Added dyson-g++ platform: linux qmake.conf + solaris-64 qplatformdefs.h
    - Added dyson-UNAME_MACHINE.patch
    - Use /usr/share/dpkg/architecture.mk in debian/rules

4 files changed, 41 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 15aebe3..05c061c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qt4-x11 (4:4.8.5+dfsg-2+dyson1) unstable; urgency=low
+
+  * Package for Dyson
+    - Added dyson-g++ platform: linux qmake.conf + solaris-64 qplatformdefs.h
+    - Added dyson-UNAME_MACHINE.patch
+    - Use /usr/share/dpkg/architecture.mk in debian/rules
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Thu, 11 Jul 2013 23:45:21 +0400
+
 qt4-x11 (4:4.8.5+dfsg-2) unstable; urgency=low
 
   * Make qtcore4-l10n M-A: foreign. Due to a limitation in dpkg which does not
diff --git a/debian/patches/dyson-UNAME_MACHINE.patch b/debian/patches/dyson-UNAME_MACHINE.patch
new file mode 100644
index 0000000..c7c8127
--- /dev/null
+++ b/debian/patches/dyson-UNAME_MACHINE.patch
@@ -0,0 +1,19 @@
+Description: UNAME_MACHINE = DEB_HOST_ARCH
+Index: qt4-x11/configure
+===================================================================
+--- qt4-x11.orig/configure	2013-07-12 00:03:59.575046079 +0400
++++ qt4-x11/configure	2013-07-12 00:04:01.125002259 +0400
+@@ -3223,6 +3223,13 @@
+                 CFG_HOST_ARCH=i386
+                 ;;
+             esac
++            ;;
++        *-amd64)
++                CFG_HOST_ARCH=x86_64
++                ;;
++        *-i386)
++                CFG_HOST_ARCH=i386
++                ;;
+         esac
+         ;;
+     Darwin:*:*)
diff --git a/debian/patches/series b/debian/patches/series
index 7b0b9c6..c3c31f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+dyson-UNAME_MACHINE.patch
diff --git a/debian/rules b/debian/rules
index b8c0700..cfbd6c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
@@ -81,7 +81,11 @@ else
   ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	platform_arg = hurd-g++
   else
-	platform_arg = glibc-g++
+    ifeq ($(DEB_HOST_ARCH),illumos-amd64)
+		platform_arg = dyson-g++
+    else
+		platform_arg = glibc-g++
+    endif
   endif
 endif
 
@@ -114,6 +118,11 @@ endif
 	rm -rf mkspecs/glibc-g++
 	cp -a mkspecs/linux-g++ mkspecs/glibc-g++
 
+	# Dyson support: like linux, but with illumos kernel and libc:
+	rm -rf mkspecs/dyson-g++
+	cp -a mkspecs/linux-g++ mkspecs/dyson-g++
+	cp mkspecs/solaris-g++-64/qplatformdefs.h mkspecs/dyson-g++/
+
 	# Remove include directory. Then ./configure will take care of calling
 	# syncqt and regenerating it.
 	rm -rf include
@@ -205,6 +214,7 @@ override_dh_auto_clean:
 	  include/ \
 	  lib/ \
 	  mkspecs/glibc-g++/ \
+	  mkspecs/dyson-g++/ \
 	  plugins/ \
 	;