diff options
Diffstat (limited to 'sci-libs/libmed/files')
7 files changed, 167 insertions, 0 deletions
diff --git a/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch b/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch new file mode 100644 index 000000000000..1f475d584843 --- /dev/null +++ b/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch @@ -0,0 +1,21 @@ +Make cmake properly disable fortran upon user requirments + +--- ./CMakeLists.txt.orig 2016-07-01 15:28:57.139304608 +0300 ++++ ./CMakeLists.txt 2016-07-01 15:34:22.295899455 +0300 +@@ -8,10 +8,13 @@ + + INCLUDE(CheckLanguage) + CHECK_LANGUAGE(Fortran) +-IF(CMAKE_Fortran_COMPILER) ++OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON) ++IF(MEDFILE_BUILD_FORTRAN) + ENABLE_LANGUAGE(Fortran) ++ IF(NOT CMAKE_Fortran_COMPILER) ++ MESSAGE(FATAL_EROOR "Fortran support was requested but not found") ++ ENDIF() + ELSE() +- MESSAGE(STATUS "No Fortran support") + ENDIF() + + ## Version number + diff --git a/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch b/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch new file mode 100644 index 000000000000..642b404ba880 --- /dev/null +++ b/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch @@ -0,0 +1,17 @@ +--- ./config/cmake_files/medMacros.cmake 2016-10-24 09:55:35.000000000 +0200 ++++ ./config/cmake_files/medMacros.cmake.new 2018-01-24 10:50:15.146953227 +0100 +@@ -412,9 +412,9 @@ + FOREACH(input ${PYFILE2COMPINST}) + GET_FILENAME_COMPONENT(inputname ${input} NAME) + INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}) +- INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")") +- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")") +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")") +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")") ++ #INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")") ++ #INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")") ++ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")") ++ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")") + ENDFOREACH(input ${PYFILE2COMPINST}) + ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC) + diff --git a/sci-libs/libmed/files/libmed-3.3.1-mpi.patch b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch new file mode 100644 index 000000000000..0516b344a0bf --- /dev/null +++ b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch @@ -0,0 +1,23 @@ +--- a/include/med.h.in 2018-07-06 10:55:49.247164591 +0200 ++++ a/include/med.h.in.new 2018-07-06 10:55:29.559164666 +0200 +@@ -19,6 +19,11 @@ + #ifndef MED_H + #define MED_H + ++@MED_DEFINE_MED_HAVE_MPI@ ++#ifdef MED_HAVE_MPI ++#include <mpi.h> ++#endif ++ + #include <hdf5.h> + #ifdef HAVE_STDINT_H + #include <stdint.h> // Use the C99 official header +@@ -66,8 +71,6 @@ + #define _MED_VERSION(x,y,z) STR(x) "." STR(y) "." STR(z) + #define MED_VERSION_STR _MED_VERSION(MED_NUM_MAJEUR,MED_NUM_MINEUR,MED_NUM_RELEASE) + +-@MED_DEFINE_MED_HAVE_MPI@ +- + #define MED_NULL (void *) NULL + #define MED_MAX_PARA 20 + diff --git a/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch new file mode 100644 index 000000000000..4c023cf24b31 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch @@ -0,0 +1,59 @@ +--- a/src/CMakeLists.txt 2018-07-28 16:37:01.180598992 +0200 ++++ a/src/CMakeLists.txt.new 2018-07-28 17:14:49.147775461 +0200 +@@ -1,7 +1,3 @@ +-INCLUDE_DIRECTORIES( +- ${HDF5_INCLUDE_DIRS} +- ${MPI_INCLUDE_DIRS}) +- + # On Win platform, we need to make sure symbols are properly exported in + # the intermediary OBJECT targes built in the sub-directories: + # The definition "-D<target>_EXPORTS" is normally added automatically by CMake +@@ -19,6 +15,12 @@ + INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include + ${PROJECT_SOURCE_DIR}/include) + ++# these includes must go after project ones to avoid masking by ++# previous versions already installed ++INCLUDE_DIRECTORIES( ++ ${HDF5_INCLUDE_DIRS} ++ ${MPI_INCLUDE_DIRS}) ++ + # Get pure C intermediary targets: + ADD_SUBDIRECTORY(hdfi) + ADD_SUBDIRECTORY(ci) +--- a/tools/mdump/CMakeLists.txt 2018-07-29 09:24:35.714930029 +0200 ++++ a/tools/mdump/CMakeLists.txt.new 2018-07-29 09:58:48.667089767 +0200 +@@ -33,6 +33,6 @@ + CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY) + + INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin) +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") + +--- a/src/2.3.6/CMakeLists.txt 2018-07-30 22:45:56.205079148 +0200 ++++ a/src/2.3.6/CMakeLists.txt.new 2018-07-30 22:49:43.520096835 +0200 +@@ -1,8 +1,3 @@ +-INCLUDE_DIRECTORIES( +- ${HDF5_INCLUDE_DIRS} +- ${MPI_INCLUDE_DIRS} +-) +- + SET(med236_SOURCES MEDaffiche.c) + + # Definitions +@@ -13,6 +8,13 @@ + "${PROJECT_BINARY_DIR}/include/2.3.6" + "${PROJECT_SOURCE_DIR}/include/2.3.6") + ++# these includes must go after project ones to avoid masking by ++# previous versions already installed ++INCLUDE_DIRECTORIES( ++ ${HDF5_INCLUDE_DIRS} ++ ${MPI_INCLUDE_DIRS} ++) ++ + # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 + # (and their static counterpart): + ADD_SUBDIRECTORY(cfi) diff --git a/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch b/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch new file mode 100644 index 000000000000..72838c3dee90 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch @@ -0,0 +1,15 @@ +--- ./config/cmake_files/medMacros.cmake 2019-01-09 17:16:00.951884862 +0100 ++++ ./config/cmake_files/medMacros.cmake.new 2019-01-09 17:18:48.753888600 +0100 +@@ -396,10 +396,10 @@ + ## + ## Requires 1.10.x version + ## +- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) +- MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") +- ENDIF() ++ #IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) ++ # MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") ++ #ENDIF() + ## + ## + diff --git a/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch new file mode 100644 index 000000000000..2d9361c42657 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch @@ -0,0 +1,15 @@ +--- ./CMakeLists.txt 2019-02-26 11:59:15.276962751 +0100 ++++ ./CMakeLists.txt.new 2019-02-26 11:59:26.660962707 +0100 +@@ -137,9 +137,10 @@ + ENDIF() + + ## Installation of the doc ++set(MEDFILE_DOC_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} CACHE PATH "install dir for documentation") + IF(MEDFILE_INSTALL_DOC OR MEDFILE_BUILD_DOC) +- INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) +- INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png") ++ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${MEDFILE_DOC_DIRECTORY} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) ++ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${MEDFILE_DOC_DIRECTORY} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png") + ENDIF() + + ####################### diff --git a/sci-libs/libmed/files/libmed-4.0.0-tests.patch b/sci-libs/libmed/files/libmed-4.0.0-tests.patch new file mode 100644 index 000000000000..91041fb4c126 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-tests.patch @@ -0,0 +1,17 @@ +--- ./tests/python/CMakeLists.txt.orig 2018-11-05 14:22:25.000000000 +0100 ++++ ./tests/python/CMakeLists.txt 2019-01-09 17:37:17.142913290 +0100 +@@ -33,11 +33,13 @@ + UseCase_MEDinterp_3.py + ) + ++FILE(COPY tests_params.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) ++ + FOREACH(_s IN LISTS _tst_scripts) + STRING(REPLACE ".py" "_Python" _tst_name ${_s}) + FILE(COPY ${_s} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + ADD_TEST(NAME ${_tst_name} +- COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}") ++ COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python:${PROJECT_BINARY_DIR}/python/med" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}") + ENDFOREACH() + + INSTALL(FILES ${_to_install} DESTINATION bin/testpy) |