tags 335002 patch
thanks
On Fri, Oct 21, 2005 at 02:05:41PM +0200, Frank Lichtenheld wrote:
> wordtrans 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 wordtrans-1.1pre14.bak/debian/changelog
wordtrans-1.1pre14/debian/changelog
--- wordtrans-1.1pre14.bak/debian/changelog 2005-10-28 21:21:48.000000000
+0200
+++ wordtrans-1.1pre14/debian/changelog 2005-10-28 21:24:35.000000000 +0200
@@ -1,3 +1,11 @@
+wordtrans (1.1pre14-1.1) unstable; urgency=high
+
+ * NMU during BSP.
+ * Rebuild with g++-3.4 on arm/hppa/m68k to work around ICE in
+ g++-4.0 (Closes: #335002)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Fri, 28 Oct 2005 21:24:24 +0200
+
wordtrans (1.1pre14-1) unstable; urgency=low
* Rebuild as required by the libqt3-mt transition (Closes: #328000)
diff -Naur wordtrans-1.1pre14.bak/debian/control-kde
wordtrans-1.1pre14/debian/control-kde
--- wordtrans-1.1pre14.bak/debian/control-kde 2005-10-28 21:21:48.000000000
+0200
+++ wordtrans-1.1pre14/debian/control-kde 2005-10-28 21:49:19.000000000
+0200
@@ -5,7 +5,7 @@
Uploaders: Javier Viñuales Gutiérrez <[EMAIL PROTECTED]>
Standards-Version: 3.5.6
Build-Depends-Indep: gettext, groff
-Build-Depends: debhelper, linuxdoc-tools-text, libfribidi-dev, kdelibs-dev
(>= 2.2.2-13) | kdelibs4-dev, recode, libqt3-compat-headers, php4-dev (>=
4:4.3.2+rc3-3)
+Build-Depends: debhelper, linuxdoc-tools-text, libfribidi-dev, kdelibs-dev
(>= 2.2.2-13) | kdelibs4-dev, recode, libqt3-compat-headers, php4-dev (>=
4:4.3.2+rc3-3), g++-3.4 [arm hppa m68k], dpkg-dev (>= 1.13.2)
Package: wordtrans-data
Architecture: all
diff -Naur wordtrans-1.1pre14.bak/debian/rules-kde
wordtrans-1.1pre14/debian/rules-kde
--- wordtrans-1.1pre14.bak/debian/rules-kde 2005-10-28 21:21:48.000000000
+0200
+++ wordtrans-1.1pre14/debian/rules-kde 2005-10-28 21:49:12.000000000 +0200
@@ -15,6 +15,18 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
+ COMP=gcc-3.4
+ CCOMP=g++-3.4
+else
+ COMP=cc
+ CCOMP=c++
+endif
+
# This is to fix #121667. Presumably some day, g++-3.0 won't be
# broken on alpha, and this can be removed
ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
@@ -37,7 +49,7 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) all_kde CFLAGS="-O2 -Wall -pipe -DHONOR_STD"
CXXFLAGS="$(CXXFLAGS)"
+ $(MAKE) all_kde CFLAGS="-O2 -Wall -pipe -DHONOR_STD"
CXXFLAGS="$(CXXFLAGS)" COMP="$(COMP)" CCOMP="$(CCOMP)"
touch build-stamp
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]
