diff options
| author |   Thomas Kahle <tom111@gmx.de> | 2010-10-27 20:13:56 +0200 |
|---|---|---|
| committer | Thomas Kahle <tom111@gmx.de> | 2010-10-27 20:14:44 +0200 |
| commit | 468bba7ae404b7433eb4ec0365fec920880b7235 (patch) | |
| tree | 6ff7c11c5ea7e991676dbb5bf402d8fa2016d673 /sci-misc/salome-kernel/files | |
| parent | Moved sci-math/nauty and its license to main tree (diff) | |
| download | sci-468bba7ae404b7433eb4ec0365fec920880b7235.tar.gz sci-468bba7ae404b7433eb4ec0365fec920880b7235.tar.bz2 sci-468bba7ae404b7433eb4ec0365fec920880b7235.zip | |
sci-misc/salome-* bumped to 5.1.4
ebuild by Michael Riss in bug 330303
Diffstat (limited to 'sci-misc/salome-kernel/files')
| -rw-r--r-- | sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch | 21 | ||||
| -rw-r--r-- | sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch | 13 |
2 files changed, 34 insertions, 0 deletions
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch new file mode 100644 index 000000000..daa51bbbf --- /dev/null +++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch @@ -0,0 +1,21 @@ +--- src5.1.4.orig/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4 2008-12-10 10:14:34.000000000 +0100 ++++ src5.1.4/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4 2009-09-29 10:14:56.821299268 +0200 +@@ -76,7 +76,7 @@ + + if test "$WITHMPI" = "yes";then + mpi_ok=yes +- MPI_LIBS="$MPI_LIBS -lmpi -lmpio -lmpiCC" ++ MPI_LIBS="$MPI_LIBS -lmpi -lmpi_cxx" + else + mpi_ok=no + fi +--- src5.1.4.orig/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx 2008-12-10 10:14:33.000000000 +0100 ++++ src5.1.4/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx 2009-09-29 11:10:13.227293648 +0200 +@@ -25,6 +25,7 @@ + #include <SALOME_Communication.hxx> + + #ifdef HAVE_MPI2 ++#define OMPI_IGNORE_CXX_SEEK 1 + #include "mpi.h" + #endif + #include <string> diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch new file mode 100644 index 000000000..2395d95bc --- /dev/null +++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch @@ -0,0 +1,13 @@ +Only in src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY: .import_hook.py.swp +diff -ur src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py +--- src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py 2010-03-07 17:35:38.450323100 +0100 ++++ src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py 2010-03-07 17:37:18.940255407 +0100 +@@ -150,7 +150,7 @@ + l.append((subname,submod)) + return l + +-def import_hook(name, globals=None, locals=None, fromlist=None, *args): ++def import_hook(name, globals=None, locals=None, fromlist=None, level=-1, *args): + """ Import replacement for sharing modules among multiple interpreters + Mostly update sys.modules before doing real import + """ |