[Pkg-octave-commit] r2366 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-29 21:04:36 +0000 (Tue, 29 Jul 2008)
New Revision: 2366

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Fix logic of passing --host and --build to configure

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-07-28 21:49:49 UTC (rev 2365)
+++ octave/trunk/debian/changelog	2008-07-29 21:04:36 UTC (rev 2366)
@@ -1,3 +1,11 @@
+octave3.1 (3.1.51-2) UNRELEASED; urgency=low
+
+  * debian/rules: Do not pass --host option to configure when it is the
+    same as the --build option.  This is mandatory with Autoconf 2.52 and
+    newer and was causing the C++ ABI to have a wrong value in config.h.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 29 Jul 2008 23:02:59 +0200
+
 octave3.1 (3.1.51-1) experimental; urgency=low
 
   * New upstream development snapshot

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-07-28 21:49:49 UTC (rev 2365)
+++ octave/trunk/debian/rules	2008-07-29 21:04:36 UTC (rev 2366)
@@ -63,6 +63,10 @@
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+host_confflags = --build=$(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  host_confflags += --host=$(DEB_HOST_GNU_TYPE)
+endif
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ## edd  3 Feb 2003  gcc 3.2, also imposed uniformly via Build-Depends
@@ -160,8 +164,7 @@
 	FLIBS=$(fc_libs)				\
 	infofile=/usr/share/info/$(PACKAGE).info	\
 	./configure					\
-			--host=$(DEB_HOST_GNU_TYPE)	\
-			--build=$(DEB_BUILD_GNU_TYPE)	\
+			$(host_confflags)		\
 			--prefix=/usr			\
 			--datadir=/usr/share		\
 			--libdir=/usr/lib		\