[Pkg-kde-commits] rev 1458 - branches/kde-3.4.0/packages/arts/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-08-16 00:24:49 +0000 (Tue, 16 Aug 2005)
New Revision: 1458

Modified:
   branches/kde-3.4.0/packages/arts/debian/changelog
   branches/kde-3.4.0/packages/arts/debian/control
   branches/kde-3.4.0/packages/arts/debian/rules
Log:
Use g++-3.4 on arm and m68k since 4.0 ICEs there (#323133):
  + debian/control: Build-Depend on g++-3.4 [arm m68k].
  + debian/rules: set and export CC, CXX and CPP on those two arches.


Modified: branches/kde-3.4.0/packages/arts/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/changelog	2005-08-15 23:55:38 UTC (rev 1457)
+++ branches/kde-3.4.0/packages/arts/debian/changelog	2005-08-16 00:24:49 UTC (rev 1458)
@@ -1,3 +1,13 @@
+arts (1.4.2-3) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Use g++-3.4 on arm and m68k since 4.0 ICEs there (#323133):
+    + debian/control: Build-Depend on g++-3.4 [arm m68k].
+    + debian/rules: set and export CC, CXX and CPP on those two arches.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 16 Aug 2005 02:22:08 +0200
+
 arts (1.4.2-2) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:

Modified: branches/kde-3.4.0/packages/arts/debian/control
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/control	2005-08-15 23:55:38 UTC (rev 1457)
+++ branches/kde-3.4.0/packages/arts/debian/control	2005-08-16 00:24:49 UTC (rev 1458)
@@ -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, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.4-4), libvorbis-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.4-4), libvorbis-dev, sharutils, texinfo
 Build-Conflicts: libmas-dev
 Standards-Version: 3.6.2
 

Modified: branches/kde-3.4.0/packages/arts/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/rules	2005-08-15 23:55:38 UTC (rev 1457)
+++ branches/kde-3.4.0/packages/arts/debian/rules	2005-08-16 00:24:49 UTC (rev 1458)
@@ -15,6 +15,17 @@
 #shlibs_ver = 1.4.2-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
+###
+
+GCC4_ICES_HERE := arm m68k
+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
+
 ### 
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)