[Pkg-kde-commits] rev 1595 - branches/kde-3.4.0/packages/kdelibs/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-08-28 22:47:29 +0000 (Sun, 28 Aug 2005)
New Revision: 1595

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
   branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
g++ 3.4 for the glorious trio (arm, m68k, hppa).


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-28 14:26:46 UTC (rev 1594)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-28 22:47:29 UTC (rev 1595)
@@ -1,3 +1,12 @@
+kdelibs (4:3.4.2-3) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Build with g++-3.4 on arm, m68k and hppa; kdelibs triggers the same gcc
+    4.0 ICE as arts does.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Aug 2005 00:10:38 +0200
+
 kdelibs (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin and Adeodato Simó:

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-28 14:26:46 UTC (rev 1594)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-28 22:47:29 UTC (rev 1595)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.6.2
 

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-08-28 14:26:46 UTC (rev 1594)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-08-28 22:47:29 UTC (rev 1595)
@@ -25,6 +25,19 @@
 
 DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2 := -V'kdelibs4c2 (>= 4:3.4.2-1)'
 
+###
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+    export CC=gcc-3.4
+    export CPP=cpp-3.4
+    export CXX=g++-3.4
+endif
+
+###
+
 #shlibs_ver = 4:3.4.2-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))