[SCM] Qt 4 packaging branch, master, updated. debian/4.7.2-1-4-gdbe50db

Sune Vuorela pusling-guest at alioth.debian.org
Sat Mar 19 18:16:01 UTC 2011


The following commit has been merged in the master branch:
commit d0a770086e4252bd2e4c72e83bd31610818d3d9a
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sat Mar 19 17:54:57 2011 +0100

    make qt use gcc4.5 on s390
---
 debian/changelog |    3 +++
 debian/control   |    3 ++-
 debian/rules     |    4 ++++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b452c98..e81b6b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qt4-x11 (4:4.7.2-2) unstable; urgency=low
     backport from Ubuntu:
     * http://launchpadlibrarian.net/66374974/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 
+  [ Sune Vuorela ]
+  * Use gcc4.5 on s390 (Closes: #606079)
+
  -- Sune Vuorela <sune at debian.org>  Sat, 19 Mar 2011 13:12:51 +0100
 
 qt4-x11 (4:4.7.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2b97260..d34a2ee 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 7.4.13), pkg-kde-tools (>= 0.6.4), flex,
  libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,
  libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
  libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, libxtst-dev,
- libxv-dev, zlib1g-dev, freetds-dev
+ libxv-dev, zlib1g-dev, freetds-dev,
+ gcc-4.5 [s390], g++-4.5 [s390]
 Standards-Version: 3.9.1
 Homepage: http://www.qtsoftware.com
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qt4-x11.git
diff --git a/debian/rules b/debian/rules
index c0e58c4..c94e2ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,10 @@ ifeq ($(DEB_HOST_ARCH),hppa)
 		exit 5 ; \
 	fi
 endif
+ifeq ($(DEB_HOST_ARCH),s390)
+	export CC=gcc-4.5
+	export CXX=gcc-4.5
+endif
 
 	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
 	# we cannot use directly linux-g++ due to src/corelib/io/io.pri

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list