[SCM] ORSA packaging branch, master, updated. debian/0.7.0-12-5-geccb6e9

Frank S. Thomas fst at debian.org
Thu Mar 12 09:59:46 UTC 2009


The following commit has been merged in the master branch:
commit eccb6e9ddbf12e218dfecc55aba2cca87031082f
Author: Frank S. Thomas <fst at debian.org>
Date:   Thu Mar 12 10:59:14 2009 +0100

    Added -DHAVE_INLINE to CPPFLAGS.
    
    debian/rules: Added -DHAVE_INLINE to CPPFLAGS so that compiling ORSA does
    not fail with "gsl_vector_long_double.h:171: error: expected constructor,
    destructor, or type conversion before ‘long’".

diff --git a/debian/changelog b/debian/changelog
index 7073564..79a55d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ orsa (0.7.0-13) UNRELEASED; urgency=low
       maintained under the umbrella of debian-science.
     - Added ${misc:Depends} to the packages' Depends field to appease Lintian.
     - Removed duplicate Section field in xorsa's binary package paragraph.
+  * debian/rules: Added -DHAVE_INLINE to CPPFLAGS so that compiling ORSA does
+    not fail with "gsl_vector_long_double.h:171: error: expected constructor,
+    destructor, or type conversion before ‘long’".
 
  -- Frank S. Thomas <fst at debian.org>  Mon, 28 Apr 2008 22:21:36 +0200
 
diff --git a/debian/rules b/debian/rules
index c16026c..2c17726 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ override DEB_BUILD_DEPENDENCIES := build-arch
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="$(CPPFLAGS) -DHAVE_INLINE"
 DEB_CONFIGURE_EXTRA_FLAGS := --with-gl
 # --with-mpi (needs lam4-dev or libmpich1.0-dev)
 

-- 
ORSA packaging



More information about the debian-science-commits mailing list