[Pkg-kde-commits] rev 2066 - branches/kde-3.4.0/packages/kdebindings/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-10-20 11:59:32 +0000 (Thu, 20 Oct 2005)
New Revision: 2066

Added:
   branches/kde-3.4.0/packages/kdebindings/debian/gcc4-blacklist.mk
Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
   branches/kde-3.4.0/packages/kdebindings/debian/control
   branches/kde-3.4.0/packages/kdebindings/debian/rules
Log:
Compile with g++ 3.4 on arm, m68k, and hppa (g++ 4.0 ICEs).


Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-20 11:58:33 UTC (rev 2065)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-20 11:59:32 UTC (rev 2066)
@@ -5,6 +5,8 @@
   * New upstream release:
     - QtRuby no longer pollutes the Module namespace. (Closes: #303608)
 
+  * Compile with g++ 3.4 on arm, m68k, and hppa (g++ 4.0 ICEs).
+
   * Build-depend on java-gcj-compat-dev, and pass
     --with-java=/usr/lib/jvm/java-gcj to ./configure; necessary because
     libgcj6-dev no longer provides /usr/include/jni.h. Remove the rest of

Modified: branches/kde-3.4.0/packages/kdebindings/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/control	2005-10-20 11:58:33 UTC (rev 2065)
+++ branches/kde-3.4.0/packages/kdebindings/debian/control	2005-10-20 11:59:32 UTC (rev 2066)
@@ -1,5 +1,5 @@
 Source: kdebindings
-Build-Depends: cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [!mips !mipsel], kdelibs4-dev (>= 4:3.4.2), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [!mips !mipsel], kdelibs4-dev (>= 4:3.4.2), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
 Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>

Added: branches/kde-3.4.0/packages/kdebindings/debian/gcc4-blacklist.mk
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/gcc4-blacklist.mk	2005-10-20 11:58:33 UTC (rev 2065)
+++ branches/kde-3.4.0/packages/kdebindings/debian/gcc4-blacklist.mk	2005-10-20 11:59:32 UTC (rev 2066)
@@ -0,0 +1,8 @@
+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)))
+    export CC=gcc-3.4
+    export CPP=cpp-3.4
+    export CXX=g++-3.4
+endif

Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-20 11:58:33 UTC (rev 2065)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-20 11:59:32 UTC (rev 2066)
@@ -8,6 +8,7 @@
 WITH_JAVA = --with-java=/usr/lib/jvm/java-gcj
 
 include debian/java-blacklist.mk
+include debian/gcc4-blacklist.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \
 		  	    DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'