[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=af5ec2e

The following commit has been merged in the master branch:
commit af5ec2ec6e951c479b75dc94eb0196da8f03342c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 1 16:22:48 2014 -0300

    Build SSE2 enabled libraries in override_dh_auto_install-arch.
---
 debian/changelog |  2 ++
 debian/rules     | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7a82ad..61889e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qtbase-opensource-src (5.3.1+dfsg-5) UNRELEASED; urgency=medium
     https://bugreports.qt-project.org/browse/QTBUG-41053
   * Make libqt5core5a recommend qttranslations5-l10n. Thanks Felix Geyer
     for the pointer.
+  * Build SSE2 enabled libraries in override_dh_auto_install-arch in order to
+    avoid rewriting the previously built versions before installing them.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 29 Aug 2014 14:38:34 -0300
 
diff --git a/debian/rules b/debian/rules
index 8842268..a16830d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,14 +217,24 @@ 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/
 
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+	# Rebuild the necessary libs with SSE2 support.
+	# Create the destination directory.
+	install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sse2/
+
+	# corelib needs make clean first to be able to rebuild.
+	cd $(CURDIR)/src/corelib; make clean ; ../../bin/qmake -config sse2; make
+	cp -av lib/libQt5Core.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sse2/
+
+	# gui on turn doesn't needs it, and actually fails if done.
+	cd $(CURDIR)/src/gui; ../../bin/qmake -config sse2; make
+	cp -av lib/libQt5Gui.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sse2/
+endif
+
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;

-- 
qtbase packaging