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

[tgg at users.alioth.debian.org]

Author: tgg
Date: Sun Feb 10 16:18:51 2008
New Revision: 129

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=129
Log:
prepare a fix (needs testing) for arm FTBFS

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

Modified: trunk/omniorb4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/changelog?rev=129&op=diff
==============================================================================
--- trunk/omniorb4/debian/changelog (original)
+++ trunk/omniorb4/debian/changelog Sun Feb 10 16:18:51 2008
@@ -1,3 +1,10 @@
+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
+
 omniorb4 (4.1.1-2) unstable; urgency=low
 
   [ Thomas Girard ]

Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=129&op=diff
==============================================================================
--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Sun Feb 10 16:18:51 2008
@@ -4,12 +4,17 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+ifeq ($(DEB_HOST_ARCH_CPU),arm)
+  confflags += --disable-alloca
 endif
 
 # CFLAGS is not honoured by the omniORB build system.