[Pkg-kde-commits] rev 1623 - branches/kde-3.4.0/packages/kdebase/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-09-01 01:10:31 +0000 (Thu, 01 Sep 2005)
New Revision: 1623

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/control
   branches/kde-3.4.0/packages/kdebase/debian/rules
Log:
Build with g++-3.4 on arm, m68k and hppa; kdebase also makes gcc 4.0 ICE
as described in #323133.


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-08-31 19:54:31 UTC (rev 1622)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-09-01 01:10:31 UTC (rev 1623)
@@ -8,6 +8,11 @@
     This had resulted in kcontrol breaking and other assorted issues.
     (Closes: #325592)
 
+  +++ Changes by Adeodato Simó:
+
+  * 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>  Wed, 31 Aug 2005 15:46:52 -0400
 
 kdebase (4:3.4.2-1) unstable; urgency=low

Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control	2005-08-31 19:54:31 UTC (rev 1622)
+++ branches/kde-3.4.0/packages/kdebase/debian/control	2005-09-01 01:10:31 UTC (rev 1623)
@@ -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, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), dbus-qt-1-dev (>= 0.23.4-5), libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-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), dbus-qt-1-dev (>= 0.23.4-5), libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.6.2

Modified: branches/kde-3.4.0/packages/kdebase/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/rules	2005-08-31 19:54:31 UTC (rev 1622)
+++ branches/kde-3.4.0/packages/kdebase/debian/rules	2005-09-01 01:10:31 UTC (rev 1623)
@@ -27,6 +27,19 @@
 DEB_DH_MAKESHLIBS_ARGS_kwin		:= -V'kwin (>= 4:3.4.2-1)'
 DEB_DH_MAKESHLIBS_ARGS_libkonq4		:= -V'libkonq4 (>= 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))'))