aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tom111@gmx.de>2010-10-27 20:13:56 +0200
committerThomas Kahle <tom111@gmx.de>2010-10-27 20:14:44 +0200
commit468bba7ae404b7433eb4ec0365fec920880b7235 (patch)
tree6ff7c11c5ea7e991676dbb5bf402d8fa2016d673 /sci-misc/salome-med/files
parentMoved sci-math/nauty and its license to main tree (diff)
downloadsci-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-med/files')
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch48
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch74
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch11
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch11
4 files changed, 144 insertions, 0 deletions
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch
new file mode 100644
index 000000000..a572ad6ae
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch
@@ -0,0 +1,48 @@
+--- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4.orig 2009-09-27 22:35:51.014701709 +0200
++++ src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4 2009-09-27 22:41:46.471297649 +0200
+@@ -28,6 +28,10 @@
+
+ METIS_CPPFLAGS=""
+ METIS_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*) METIS_LIBSUFFIX="64" ;;
++*) METIS_LIBSUFFIX="" ;;
++esac
+ METIS_LIBS=""
+ ENABLE_METIS="no"
+
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+
+ if test "x${METISDIR}" != "x" ; then
+- METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
+- METIS_LIBS="-L${METISDIR} -lmetis"
++ METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis"
++ METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis"
+ fi
+
+ metis_ok=no
+@@ -57,7 +61,7 @@
+
+ metis_include_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+- AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
++ AC_CHECK_FILE(${METISDIR}/include/metis/metis.h,
+ metis_include_dir_ok=yes,
+ metis_include_dir_ok=no)
+ fi
+@@ -81,12 +85,12 @@
+ AC_CHECKING(for METIS binaries)
+ metis_lib_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+- AC_CHECK_FILE(${METISDIR}/libmetis.a,
++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+ metis_lib_dir_ok=yes,
+ metis_lib_dir_ok=no)
+ if test "x${metis_lib_dir_ok}" = "xno" ; then
+ METIS_LIBSUFFIX=""
+- AC_CHECK_FILE(${METISDIR}/libmetis.a,
++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+ metis_lib_dir_ok=yes,
+ metis_lib_dir_ok=no)
+ fi
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch
new file mode 100644
index 000000000..bcf050914
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch
@@ -0,0 +1,74 @@
+--- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4.orig 2009-09-27 23:07:31.245061430 +0200
++++ src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4 2009-09-27 23:11:02.080868671 +0200
+@@ -28,6 +28,10 @@
+
+ SCOTCH_CPPFLAGS=""
+ SCOTCH_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*) SCOTCH_LIBSUFFIX="64" ;;
++*) SCOTCH_LIBSUFFIX="" ;;
++esac
+ SCOTCH_LIBS=""
+ ENABLE_SCOTCH="no"
+
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+
+ if test "x${SCOTCHDIR}" != "x" ; then
+- SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}"
+- SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr"
++ SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch"
++ SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr"
+ fi
+
+ scotch_ok=no
+@@ -57,14 +61,14 @@
+
+ scotch_include_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h,
++ AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h,
+ scotch_include_dir_ok=yes,
+ scotch_include_dir_ok=no)
+ fi
+
+ if test "x${scotch_include_dir_ok}" = "xyes" ; then
+ AC_TRY_COMPILE([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_headers_ok=yes,
+@@ -83,12 +87,12 @@
+ AC_CHECKING(for SCOTCH binaries)
+ scotch_lib_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+ scotch_lib_dir_ok=yes,
+ scotch_lib_dir_ok=no)
+ if test "x${scotch_lib_dir_ok}" = "xno" ; then
+ SCOTCH_LIBSUFFIX=""
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+ scotch_lib_dir_ok=yes,
+ scotch_lib_dir_ok=no)
+ fi
+@@ -96,7 +100,7 @@
+ if test "x${scotch_lib_dir_ok}" = "xyes" ; then
+ LIBS="${LIBS_old} ${SCOTCH_LIBS}"
+ AC_TRY_LINK([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_binaries_ok=yes,
+@@ -105,7 +109,7 @@
+ SCOTCH_LIBSUFFIX=""
+ LIBS="${LIBS_old} ${SCOTCH_LIBS} "
+ AC_TRY_LINK([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_binaries_ok=yes,
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch
new file mode 100644
index 000000000..102cb913d
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch
@@ -0,0 +1,11 @@
+--- ./src5.1.4.orig/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:14:50.721209673 +0100
++++ ./src5.1.4/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:15:35.420479255 +0100
+@@ -21,7 +21,7 @@
+ //
+ #include <med.h>
+ #include <string.h>
+-
++#include <stdlib.h>
+
+ /*****************************************************************************************************/
+
diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch
new file mode 100644
index 000000000..4045559d0
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch
@@ -0,0 +1,11 @@
+--- src5.1.4.orig/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2008-12-10 10:14:43.000000000 +0100
++++ src5.1.4/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2009-09-27 23:26:59.010112791 +0200
+@@ -19,7 +19,7 @@
+ #include <cstdio>
+ extern "C" {
+ #define restrict
+-#include "bin/scotch.h"
++#include "scotch.h"
+ }
+ #include "MEDSPLITTER_Graph.hxx"
+ #include "MEDSPLITTER_SCOTCHGraph.hxx"