diff options
| author |   Bernd Waibel <waebbl@gmail.com> | 2020-11-26 00:39:58 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-12-01 09:56:02 +0200 |
| commit | 682260b51f9e3ae1337c15b5b725f1c50f978a97 (patch) | |
| tree | 649a5e4a4882a4efb3ea56060428387a63833284 /sci-libs/med/files | |
| parent | media-gfx/asymptote: clean old versions (diff) | |
| download | gentoo-682260b51f9e3ae1337c15b5b725f1c50f978a97.tar.gz gentoo-682260b51f9e3ae1337c15b5b725f1c50f978a97.tar.bz2 gentoo-682260b51f9e3ae1337c15b5b725f1c50f978a97.zip | |
sci-libs/med: bump to 4.1.0
Closes: https://bugs.gentoo.org/756208
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sci-libs/med/files')
| -rw-r--r-- | sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch | 26 | ||||
| -rw-r--r-- | sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch | 39 |
2 files changed, 65 insertions, 0 deletions
diff --git a/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch b/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch new file mode 100644 index 000000000000..e066385def8f --- /dev/null +++ b/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch @@ -0,0 +1,26 @@ +From ccc372d4fa95ea2e083505ec5c536a48c49dd151 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Wed, 25 Nov 2020 21:08:46 +0100 +Subject: [PATCH] [Gentoo-specific] Adjust install path for build dir + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + tools/mdump/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/mdump/CMakeLists.txt b/tools/mdump/CMakeLists.txt +index 991b5af..dd2018a 100644 +--- a/tools/mdump/CMakeLists.txt ++++ b/tools/mdump/CMakeLists.txt +@@ -44,6 +44,6 @@ CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY) + CONFIGURE_FILE(xmdump4.in ${PROJECT_BINARY_DIR}/xmdump4 @ONLY) + + INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 ${PROJECT_BINARY_DIR}/xmdump4 DESTINATION bin) +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump4 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump4 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump4 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin\")") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump4 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin\")") + +-- +2.29.2 + diff --git a/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch b/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch new file mode 100644 index 000000000000..b5c3364b799e --- /dev/null +++ b/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch @@ -0,0 +1,39 @@ +From 3c8eb1ca6be13f185f20ee726f91f31d717947d2 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Sat, 28 Nov 2020 21:52:29 +0100 +Subject: [PATCH] Re-add option for building Fortran library + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + CMakeLists.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2262275..7cb014c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,12 +6,15 @@ PROJECT(MEDFile C CXX) + ## See http://www.cmake.org/Bug/view.php?id=10227 + #ENABLE_LANGUAGE(Fortran OPTIONAL) + +-INCLUDE(CheckLanguage) +-CHECK_LANGUAGE(Fortran) +-IF(CMAKE_Fortran_COMPILER) +- ENABLE_LANGUAGE(Fortran) +-ELSE() +- MESSAGE(STATUS "No Fortran support") ++OPTION (MEDFILE_BUILD_FORTRAN "Build MED-file fortran library" ON) ++IF (MEDFILE_BUILD_FORTRAN) ++ INCLUDE(CheckLanguage) ++ CHECK_LANGUAGE(Fortran) ++ IF(CMAKE_Fortran_COMPILER) ++ ENABLE_LANGUAGE(Fortran) ++ ELSE() ++ MESSAGE(STATUS "No Fortran support") ++ ENDIF() + ENDIF() + + ## Version number +-- +2.29.2 + |