r36640 - in /packages/fenics/dolfin/trunk/debian: changelog patches/scotch.patch

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Mon Jun 14 11:26:51 2010
New Revision: 36640

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36640
Log:
Add patch for detecting SCOTCH.

Added:
    packages/fenics/dolfin/trunk/debian/patches/scotch.patch
Modified:
    packages/fenics/dolfin/trunk/debian/changelog

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=36640&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Mon Jun 14 11:26:51 2010
@@ -1,3 +1,9 @@
+dolfin (0.9.7-5) unstable; urgency=low
+
+  * Add patch from upstream to detect and build with SCOTCH.
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 14 Jun 2010 13:15:04 +0200
+
 dolfin (0.9.7-4) unstable; urgency=low
 
   * Add support for PETSc 3.1 (closes: #583419).

Added: packages/fenics/dolfin/trunk/debian/patches/scotch.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/scotch.patch?rev=36640&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/scotch.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/scotch.patch Mon Jun 14 11:26:51 2010
@@ -1,0 +1,55 @@
+diff -Nru dolfin-0.9.7.orig/scons/simula-scons/simula_scons/pkgconfiggenerators/scotch.py dolfin-0.9.7/scons/simula-scons/simula_scons/pkgconfiggenerators/scotch.py
+--- dolfin-0.9.7.orig/scons/simula-scons/simula_scons/pkgconfiggenerators/scotch.py	2010-02-17 18:50:50.000000000 +0100
++++ dolfin-0.9.7/scons/simula-scons/simula_scons/pkgconfiggenerators/scotch.py	2010-06-14 13:20:49.000000000 +0200
+@@ -59,10 +59,8 @@
+     
+     # Simple test-program that try to include the main scotch header
+     cpp_test_include_str = r"""
+-extern "C" {
+ #include <stdio.h>
+ #include <scotch.h>
+-}
+ int main() {
+   return 0;
+ }
+@@ -107,10 +105,8 @@
+     
+     # Test that we can call a SCOTCH function
+     cpp_test_lib_str = r"""
+-extern "C" {
+ #include <stdio.h>
+ #include <scotch.h>
+-}
+ #include <iostream>
+ int main() {
+   SCOTCH_Mesh mesh;
+@@ -139,13 +135,16 @@
+     lib_dirs = ['', 'bin', 'lib']
+     for lib_dir in lib_dirs:
+         scotch_lib_dir = os.path.join(scotch_dir, lib_dir)
+-        libscotch_static = os.path.join(scotch_lib_dir, 'libptscotch.a')
+-        libscotcherr_static = os.path.join(scotch_lib_dir, 'libptscotcherr.a')
++        libscotch_static = os.path.join(scotch_lib_dir, 'libscotch.a')
++        libscotcherr_static = os.path.join(scotch_lib_dir, 'libscotcherr.a')
++        libptscotch_static = os.path.join(scotch_lib_dir, 'libptscotch.a')
++        libptscotcherr_static = os.path.join(scotch_lib_dir, 'libptscotcherr.a')
+ 
+         # test that we can link a binary using scotch static libs:
+-        cmdstr = "%s -o %s %s %s %s" % \
++        cmdstr = "%s -o %s %s %s %s %s %s" % \
+                  (linker, app, cpp_file.replace('.cpp', '.o'),
+-                  libscotch_static, libscotcherr_static)
++		  libscotch_static, libscotcherr_static,
++                  libptscotch_static, libptscotcherr_static)
+         linkFailed, cmdoutput = getstatusoutput(cmdstr)
+         if not linkFailed:
+             break
+@@ -162,7 +161,7 @@
+     if runFailed or not cmdoutput == "success":
+         raise UnableToRunException("SCOTCH", errormsg=cmdoutput)
+ 
+-    return "-L%s -lptscotch -lptscotcherr" % scotch_lib_dir
++    return "-L%s -lscotch -lscotcherr -lptscotch -lptscotcherr" % scotch_lib_dir
+ 
+ def pkgTests(forceCompiler=None, sconsEnv=None,
+              cflags=None, libs=None, version=None, **kwargs):