[Pkg-kde-commits] rev 1626 - branches/kde-3.4.0/packages/kdenetwork/debian

[Luk Claes]

Author: luk
Date: 2005-09-01 08:51:56 +0000 (Thu, 01 Sep 2005)
New Revision: 1626

Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/control
   branches/kde-3.4.0/packages/kdenetwork/debian/rules
Log:
ICE on arm, m68k and hppa


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-01 06:50:17 UTC (rev 1625)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-01 08:51:56 UTC (rev 1626)
@@ -1,10 +1,13 @@
 kdenetwork (4:3.4.2-2) UNRELEASED; urgency=low
 
   +++ Changes by Luk Claes:
-  
+
   * Updated FSF address.
+   
+  * Build with g++-3.4 on arm, m68k and hppa; kdebase also makes gcc 4.0 ICE
+    as described in #323133.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Aug 2005 18:51:40 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Sep 2005 10:46:08 +0200
 
 kdenetwork (4:3.4.2-1) unstable; urgency=low
 

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-09-01 06:50:17 UTC (rev 1625)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-09-01 08:51:56 UTC (rev 1626)
@@ -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>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.6.2
 
 Package: kdenetwork

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/rules	2005-09-01 06:50:17 UTC (rev 1625)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/rules	2005-09-01 08:51:56 UTC (rev 1626)
@@ -10,6 +10,19 @@
 DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.4.2-1)'
 DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 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))'))