Please find attached the diff of the latest NMU.

-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   [EMAIL PROTECTED]         | [EMAIL PROTECTED]
   `-    people.debian.org/~aurel32 | www.aurel32.net
diff -u ecos-2.0/debian/control ecos-2.0/debian/control
--- ecos-2.0/debian/control
+++ ecos-2.0/debian/control
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Masato Taruishi <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), dbs, cpio, tcl8.3-dev, tk8.3-dev, bzip2, 
docbook-to-man, libgtk1.2-dev, libwxgtk2.4-dev, autotools-dev
+Build-Depends: debhelper (>> 3.0.0), dbs, cpio, tcl8.3-dev, tk8.3-dev, bzip2, 
docbook-to-man, libgtk1.2-dev, libwxgtk2.4-dev, autotools-dev, g++-3.4 [arm 
m68k hppa]
 Standards-Version: 3.5.6
 
 Package: ecos
diff -u ecos-2.0/debian/changelog ecos-2.0/debian/changelog
--- ecos-2.0/debian/changelog
+++ ecos-2.0/debian/changelog
@@ -1,3 +1,10 @@
+ecos (2.0-0pre2.3) unstable; urgency=low
+
+  * NMU.
+  * Use g++-3.4 on arm, m68k and hppa since 4.0 ICEs (closes: bug#327838).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]>  Fri, 21 Oct 2005 00:18:23 +0200
+
 ecos (2.0-0pre2.2) unstable; urgency=low
 
   * 0-day NMU (BSP).
diff -u ecos-2.0/debian/rules ecos-2.0/debian/rules
--- ecos-2.0/debian/rules
+++ ecos-2.0/debian/rules
@@ -33,6 +33,14 @@
 CT2BUILDOPTS = $(CONCURRENCY_FLAG) -f 
../$(BUILD_TREE)/ecos-2.0/tools/src/tools/configtool/standalone/wxwin/Makefile 
ECOSDIR=$(TOPDIR)/$(BUILD_TREE)/ecos-2.0/ LEVEL=$(LEVEL) 
ECOSBUILDDIR=$(TOPDIR)/build/tools/src/ WXDIR=/usr WXBUILDDIR=/usr/bin 
INCLUDEPREFIX= LIBPREFIX=
 #CT2BUILDOPTS = $(CONCURRENCY_FLAG) -f 
../$(BUILD_TREE)/ecos-2.0/tools/src/tools/configtool/standalone/wxwin/Makefile 
ECOSDIR=$(TOPDIR)/$(BUILD_TREE)/ecos-2.0/ LEVEL=$(LEVEL) 
ECOSBUILDDIR=$(TOPDIR)/build/tools/src/ WXDIR=$(TOPDIR)/$(BUILD_TREE)
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifneq (,$(findstring $(DEB_BUILD_ARCH),arm m68k hppa))
+    export CC=gcc-3.4
+    export CPP=cpp-3.4
+    export CXX=g++-3.4
+endif
+           
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir

Reply via email to