[DebianGIS-dev] r1575 - packages/geos/trunk/debian

[kobold at alioth.debian.org]

Author: kobold
Date: 2008-05-12 10:35:45 +0000 (Mon, 12 May 2008)
New Revision: 1575

Modified:
   packages/geos/trunk/debian/changelog
   packages/geos/trunk/debian/rules
Log:
debian/rules: fixed a FTBFS on arm eabi; patch from Riku Voipio.
(Closes: #480345)

Modified: packages/geos/trunk/debian/changelog
===================================================================
--- packages/geos/trunk/debian/changelog	2008-05-10 17:41:26 UTC (rev 1574)
+++ packages/geos/trunk/debian/changelog	2008-05-12 10:35:45 UTC (rev 1575)
@@ -1,3 +1,10 @@
+geos (3.0.0-5) unstable; urgency=low
+
+  * debian/rules: fixed a FTBFS on arm eabi; patch from Riku Voipio.
+    (Closes: #480345)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Mon, 12 May 2008 12:33:47 +0200
+
 geos (3.0.0-4) unstable; urgency=low
 
   * [PATCH] gcc4.3.dpatch added to manage GCC 4.3 issue.

Modified: packages/geos/trunk/debian/rules
===================================================================
--- packages/geos/trunk/debian/rules	2008-05-10 17:41:26 UTC (rev 1574)
+++ packages/geos/trunk/debian/rules	2008-05-12 10:35:45 UTC (rev 1575)
@@ -27,6 +27,9 @@
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
+ifeq ($(DEB_HOST_GNU_TYPE),arm-linux-gnueabi)
+       CONFFLAGS += --disable-inline
+endif
 
 # shared library versions, option 1
 version=2.0.5
@@ -49,7 +52,7 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 	
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFFLAGS)
 
 
 #Architecture