diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:11:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:11:03 +0100 |
commit | 2929788def9a92c1eb237eed93fbdb0c02838bbf (patch) | |
tree | 166b01591366d3479084ea774c888bc84aaa8d4f /sci-libs/med/files | |
parent | ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030 (diff) |
Revert "gentoo resync : 13.10.2019"
This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.
Diffstat (limited to 'sci-libs/med/files')
-rw-r--r-- | sci-libs/med/files/med-3.3.1-cmake-fortran.patch | 21 | ||||
-rw-r--r-- | sci-libs/med/files/med-3.3.1-disable-python-compile.patch | 17 | ||||
-rw-r--r-- | sci-libs/med/files/med-4.0.0-cmakelist.patch | 59 | ||||
-rw-r--r-- | sci-libs/med/files/med-4.0.0-installdoc.patch | 15 |
4 files changed, 0 insertions, 112 deletions
diff --git a/sci-libs/med/files/med-3.3.1-cmake-fortran.patch b/sci-libs/med/files/med-3.3.1-cmake-fortran.patch deleted file mode 100644 index 1f475d584843..000000000000 --- a/sci-libs/med/files/med-3.3.1-cmake-fortran.patch +++ /dev/null @@ -1,21 +0,0 @@ -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/med/files/med-3.3.1-disable-python-compile.patch b/sci-libs/med/files/med-3.3.1-disable-python-compile.patch deleted file mode 100644 index 642b404ba880..000000000000 --- a/sci-libs/med/files/med-3.3.1-disable-python-compile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./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/med/files/med-4.0.0-cmakelist.patch b/sci-libs/med/files/med-4.0.0-cmakelist.patch deleted file mode 100644 index 4c023cf24b31..000000000000 --- a/sci-libs/med/files/med-4.0.0-cmakelist.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- 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/med/files/med-4.0.0-installdoc.patch b/sci-libs/med/files/med-4.0.0-installdoc.patch deleted file mode 100644 index 2d9361c42657..000000000000 --- a/sci-libs/med/files/med-4.0.0-installdoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./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() - - ####################### |