[SCM] qtbase packaging branch, master, updated. debian/5.3.1+dfsg-5

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=7a831ad

The following commit has been merged in the master branch:
commit 7a831ade77cab3cd152436ae53f1b886a1cf42ff
Author: Julián Moreno Patiño <julian at debian.org>
Date:   Fri Aug 29 10:13:33 2014 -0500

    Add support for non-sse2 processors
---
 debian/changelog |  7 +++++++
 debian/rules     | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9b8b85e..d5c07a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.3.1+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * Add support for non-sse2 processors.
+
+ -- Julián Moreno Patiño <julian at debian.org>  Thu, 28 Aug 2014 17:23:19 -0500
+
 qtbase-opensource-src (5.3.1+dfsg-3) unstable; urgency=medium
 
   * Improve NEWS wording.
diff --git a/debian/rules b/debian/rules
index f1b07bb..d389b82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 export PATH := $(PATH):$(shell pwd)/bin
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -64,6 +65,11 @@ ifneq ($(DEB_HOST_ARCH_OS),linux)
 	extra_configure_opts += -no-eglfs
 endif
 
+# Compile by default without sse2 support
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+	cpu_opt = -no-sse2
+endif
+
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
 	platform_arg = linux-g++
@@ -128,7 +134,8 @@ override_dh_auto_configure:
 	            -accessibility \
 	            -compile-examples \
 	            -no-directfb \
-	            $(extra_configure_opts)
+                   $(extra_configure_opts) \
+	            $(cpu_opt)
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) confclean distclean
@@ -211,6 +218,10 @@ override_dh_auto_build-indep:
 	cd $(CURDIR)/src/corelib; ../../bin/qmake
 	cd $(CURDIR)/src/xml; ../../bin/qmake
 	dh_auto_build -Smakefile -- html_docs
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+	cd $(CURDIR)/src/corelib; ../../bin/qmake -config sse2; make
+	cd $(CURDIR)/src/xml; ../../bin/qmake -config sse2; make
+endif
 
 override_dh_auto_install-arch:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/

-- 
qtbase packaging