r46423 - in /packages/fenics/dolfin/trunk/debian: changelog patches/CSGCGALMeshGenerator3D-oom.patch patches/series

[sebastien at users.alioth.debian.org]

Author: sebastien
Date: Sat Dec 14 18:36:21 2013
New Revision: 46423

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46423
Log:
  * Team upload.
  * CSGCGALMeshGenerator3D-oom.patch: new patch, workaround for FTBFS on some
    arches due to g++ eating all the RAM.


Added:
    packages/fenics/dolfin/trunk/debian/patches/CSGCGALMeshGenerator3D-oom.patch
Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/patches/series

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=46423&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Sat Dec 14 18:36:21 2013
@@ -1,3 +1,11 @@
+dolfin (1.2.0+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * CSGCGALMeshGenerator3D-oom.patch: new patch, workaround for FTBFS on some
+    arches due to g++ eating all the RAM.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Sat, 14 Dec 2013 19:16:13 +0100
+
 dolfin (1.2.0+dfsg-3) unstable; urgency=low
 
   * Team upload.

Added: packages/fenics/dolfin/trunk/debian/patches/CSGCGALMeshGenerator3D-oom.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/CSGCGALMeshGenerator3D-oom.patch?rev=46423&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/CSGCGALMeshGenerator3D-oom.patch	(added)
+++ packages/fenics/dolfin/trunk/debian/patches/CSGCGALMeshGenerator3D-oom.patch	Sat Dec 14 18:36:21 2013
@@ -0,0 +1,21 @@
+Description: Disable optimization and debugging flags for CSGCGALMeshGenerator3D.cpp
+ This is a workaround for a g++ 4.8.2 issue which eats all the RAM of the buildds.
+ See https://buildd.debian.org/status/fetch.php?pkg=dolfin&arch=armhf&ver=1.2.0%2Bdfsg-3%2Bb1&stamp=1386829168 for example.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-12-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: dolfin-1.2.0+dfsg/dolfin/CMakeLists.txt
+===================================================================
+--- dolfin-1.2.0+dfsg.orig/dolfin/CMakeLists.txt	2013-03-24 17:25:41.000000000 +0100
++++ dolfin-1.2.0+dfsg/dolfin/CMakeLists.txt	2013-12-14 18:31:57.000000000 +0100
+@@ -269,6 +269,8 @@
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${DOLFIN_LINK_FLAGS}")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${DOLFIN_LINK_FLAGS}")
+ 
++set_source_files_properties(generation/CSGCGALMeshGenerator3D.cpp PROPERTIES COMPILE_FLAGS "-O0 -g0")
++
+ # Define libraries
+ add_library(dolfin ${DOLFIN_H} ${HEADERS} ${SOURCES})
+ set_target_properties(dolfin PROPERTIES ${DOLFIN_LIBRARY_PROPERTIES})

Modified: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=46423&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series	(original)
+++ packages/fenics/dolfin/trunk/debian/patches/series	Sat Dec 14 18:36:21 2013
@@ -1,2 +1,3 @@
 slepc-3.4.patch
 petsc-3.4.patch
+CSGCGALMeshGenerator3D-oom.patch