[Pkg-kde-commits] rev 1919 - branches/kde-3.4.0/packages/kdewebdev/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-10-05 14:49:03 +0000 (Wed, 05 Oct 2005)
New Revision: 1919

Modified:
   branches/kde-3.4.0/packages/kdewebdev/debian/changelog
   branches/kde-3.4.0/packages/kdewebdev/debian/control
   branches/kde-3.4.0/packages/kdewebdev/debian/rules
Log:
gcc-3.4 for kdewebdev, which must have been feeling left out.


Modified: branches/kde-3.4.0/packages/kdewebdev/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/changelog	2005-10-05 13:23:14 UTC (rev 1918)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/changelog	2005-10-05 14:49:03 UTC (rev 1919)
@@ -1,3 +1,12 @@
+kdewebdev (4:3.4.2-2) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Build with g++-3.4 on arm, m68k and hppa, as kdewebdev fails with the same gcc
+    4.0 ICE as do most other KDE modules.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdewebdev (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/kde-3.4.0/packages/kdewebdev/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/control	2005-10-05 13:23:14 UTC (rev 1918)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/control	2005-10-05 14:49:03 UTC (rev 1919)
@@ -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 debian.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, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libcvsservice-dev (>= 4:3.4.2), libreadline4-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libcvsservice-dev (>= 4:3.4.2), libreadline4-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
 Standards-Version: 3.6.2
 
 Package: kdewebdev

Modified: branches/kde-3.4.0/packages/kdewebdev/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdewebdev/debian/rules	2005-10-05 13:23:14 UTC (rev 1918)
+++ branches/kde-3.4.0/packages/kdewebdev/debian/rules	2005-10-05 14:49:03 UTC (rev 1919)
@@ -15,5 +15,18 @@
 
 DEB_DH_MAKESHLIBS_ARGS_kommander := -V'kommander (>= 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))'))