tags #335001 patch
thanks

On Fri, Oct 21, 2005 at 02:03:22PM +0200, Frank Lichtenheld wrote:
> superkaramba suffers from the usual GCC 4.0 ICE on arm, hppa and m68k.
> Please use gcc-3.4 on these architectures to work around it.

I plan to NMU this during the current BSP with the following patch
unless you have any objections:
diff -Naur superkaramba-0.36.bak/debian/changelog 
superkaramba-0.36/debian/changelog
--- superkaramba-0.36.bak/debian/changelog      2005-09-11 19:16:05.000000000 
+0200
+++ superkaramba-0.36/debian/changelog  2005-10-28 23:07:14.000000000 +0200
@@ -1,3 +1,13 @@
+superkaramba (0.36-2.1) unstable; urgency=medium
+
+  * NMU during BSP
+  * Build with g++-3.4 on arm/hppa/m68k to work around ICE with g++-4.0
+    (Closes: #335001)
+  * Make non-native package again after 0.36-2 was accidentially a native
+    one
+  
+ -- Frank Lichtenheld <[EMAIL PROTECTED]>  Fri, 28 Oct 2005 22:38:10 +0200
+
 superkaramba (0.36-2) unstable; urgency=low
 
   * Build with kdebase-dev (>= 4:3.4.2-2) for C++ transition.
diff -Naur superkaramba-0.36.bak/debian/control superkaramba-0.36/debian/control
--- superkaramba-0.36.bak/debian/control        2005-09-11 19:16:05.000000000 
+0200
+++ superkaramba-0.36/debian/control    2005-10-28 22:52:00.000000000 +0200
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Jean-Michel Kelbert <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), xmms-dev, python-dev, kdebase-dev (>= 
4:3.4.2-2), xutils, dpatch, libxpm-dev
+Build-Depends: debhelper (>> 4.0.0), xmms-dev, python-dev, kdebase-dev (>= 
4:3.4.2-2), xutils, dpatch, libxpm-dev, g++-3.4 [arm hppa m68k], dpkg-dev (>= 
1.13.2)
 Standards-Version: 3.5.8
 
 Package: superkaramba
diff -Naur superkaramba-0.36.bak/debian/rules superkaramba-0.36/debian/rules
--- superkaramba-0.36.bak/debian/rules  2005-09-11 19:16:05.000000000 +0200
+++ superkaramba-0.36/debian/rules      2005-10-28 22:58:34.000000000 +0200
@@ -12,17 +12,13 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+GCC4_ICES_HERE := arm m68k hppa
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
+       export CC=gcc-3.4
+       export CPP=cpp-3.4
+       export CXX=g++-3.4
 endif
 
 clean-upstream:

I removed the CFLAGS handling because it doesn't do anything (it's
CXXFLAGS, and it needs to be exported, and the autotools stuff didn't
handle it very well when I tried to fix it...)

Gruesse,
-- 
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to