[SCM] Eigen2 packaging branch, master, updated. debian/2.0.14-1-11-ga66f03b

Ana Beatriz Guerrero López ana at alioth.debian.org
Thu Aug 5 15:47:26 UTC 2010


The following commit has been merged in the master branch:
commit 0d5030d0cb0c7c5e093a6a315f6035deb2e674ae
Author: Ana Beatriz Guerrero López <ana at ekaia.org>
Date:   Thu Aug 5 11:19:44 2010 -0400

    Add fix for hppa bug #591576.
    
    Add patch build-snippets-with-O2 and patch support with quilt.
---
 debian/changelog                      |   11 +++++++++--
 debian/patches/build-snippets-with-O2 |   15 +++++++++++++++
 debian/patches/series                 |    1 +
 debian/rules                          |    1 +
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d876c55..f2e7544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-eigen2 (2.0.14-2) UNRELEASED; urgency=low
+eigen2 (2.0.15-1) unstable; urgency=low
 
+  * New upstream release.
+
+  [ Modestas Vainius ]
   * Add Vcs fields to debian/control.
 
- -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:33:19 +0300
+  [ Ana Beatriz Guerrero Lopez ]
+  * Fix FTBFS in hppa, patch build-snippets-with-O2. (Closes: #591576)
+    It workarounds some kind of problem with the compiler flags order.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 05 Aug 2010 11:06:44 -0400
 
 eigen2 (2.0.14-1) unstable; urgency=low
 
diff --git a/debian/patches/build-snippets-with-O2 b/debian/patches/build-snippets-with-O2
new file mode 100644
index 0000000..a2d46bd
--- /dev/null
+++ b/debian/patches/build-snippets-with-O2
@@ -0,0 +1,15 @@
+This fixes the FTBFS in hppa:
+https://buildd.debian.org/fetch.cgi?&pkg=eigen2&ver=2.0.14-1&arch=hppa&stamp=1279087164&file=log
+Apparently, it workarounds some kind of problem with the compiler flags order.
+Bug #591576.
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -3,7 +3,7 @@ set_directory_properties(PROPERTIES EXCL
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+   if(CMAKE_SYSTEM_NAME MATCHES Linux)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -g1")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g1")
+   endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif(CMAKE_COMPILER_IS_GNUCXX)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b668513
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-snippets-with-O2
diff --git a/debian/rules b/debian/rules
index 267985b..c3f1c49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ endif
 
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 binary-post-install/libeigen2-dev::
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

-- 
Eigen2 packaging



More information about the pkg-kde-commits mailing list