[Pkg-corba-commits] r130 - in /trunk/omniorb4/debian: changelog control rules

[tgg at users.alioth.debian.org]

Author: tgg
Date: Sun Feb 24 21:30:27 2008
New Revision: 130

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=130
Log:
fix #460419

Modified:
    trunk/omniorb4/debian/changelog
    trunk/omniorb4/debian/control
    trunk/omniorb4/debian/rules

Modified: trunk/omniorb4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/changelog?rev=130&op=diff
==============================================================================
--- trunk/omniorb4/debian/changelog (original)
+++ trunk/omniorb4/debian/changelog Sun Feb 24 21:30:27 2008
@@ -1,9 +1,8 @@
 omniorb4 (4.1.1-3) unstable; urgency=low
 
-  * Pass --disable-alloca to configure when building on arm to fix FTBFS.
-    Closes: #460419.
-
- -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 10 Feb 2008 14:54:59 +0100
+  * Build with g++-4.1 on arm to fix FTBFS. Closes: #460419.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 24 Feb 2008 22:29:08 +0100
 
 omniorb4 (4.1.1-2) unstable; urgency=low
 

Modified: trunk/omniorb4/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/control?rev=130&op=diff
==============================================================================
--- trunk/omniorb4/debian/control (original)
+++ trunk/omniorb4/debian/control Sun Feb 24 21:30:27 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian CORBA Team <pkg-corba-devel at lists.alioth.debian.org>
 Uploaders: Floris Bruynooghe <floris.bruynooghe at gmail.com>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>= 5.0.38), python-dev, libssl-dev, autotools-dev, python-central (>= 0.5.6)
+Build-Depends: debhelper (>= 5.0.38), python-dev, libssl-dev, autotools-dev, python-central (>= 0.5.6), g++-4.1 [arm]
 XS-Python-Version: current
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-corba/trunk/omniorb4

Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=130&op=diff
==============================================================================
--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Sun Feb 24 21:30:27 2008
@@ -13,8 +13,10 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+# Use g++-4.1 on arm (see #460419)
 ifeq ($(DEB_HOST_ARCH_CPU),arm)
-  confflags += --disable-alloca
+  CC  = gcc-4.1
+  CXX = g++-4.1
 endif
 
 # CFLAGS is not honoured by the omniORB build system.