diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /sci-libs/med/files | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'sci-libs/med/files')
3 files changed, 65 insertions, 50 deletions
diff --git a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch deleted file mode 100644 index e9dad6d5febe..000000000000 --- a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Sun, 1 Sep 2019 22:02:42 +0200 -Subject: [PATCH] doc/html.doc/Makefile.am: install into $htmldir - -Patches the install-data-local target to use $htmldir instead of $docdir - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - doc/html.dox/Makefile.am | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/doc/html.dox/Makefile.am b/doc/html.dox/Makefile.am -index 9dc5b08..3946777 100644 ---- a/doc/html.dox/Makefile.am -+++ b/doc/html.dox/Makefile.am -@@ -36,25 +36,25 @@ html-local: $(builddir)/../dox/Doxyfile.cfg - diff $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am || @CP@ $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am - - install-data-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3) -- test -z "$(DESTDIR)$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" -+ test -z "$(DESTDIR)$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" - for i in $(htmllistfile1) ; do \ - $(INSTALL_DATA) \ - `test -f $$i || echo $(srcdir)/`$$i \ -- $(DESTDIR)$(docdir) ; \ -+ $(DESTDIR)$(htmldir) ; \ - done - for i in $(htmllistfile2) ; do \ - $(INSTALL_DATA) \ - `test -f $$i || echo $(srcdir)/`$$i \ -- $(DESTDIR)$(docdir) ; \ -+ $(DESTDIR)$(htmldir) ; \ - done - for i in $(htmllistfile3) ; do \ - $(INSTALL_DATA) \ - `test -f $$i || echo $(srcdir)/`$$i \ -- $(DESTDIR)$(docdir) ; \ -+ $(DESTDIR)$(htmldir) ; \ - done - - uninstall-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3) -- rm -rf $(DESTDIR)$(docdir); -+ rm -rf $(DESTDIR)$(htmldir); - - .PHONY: htmlclean - --- -2.22.0 - 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 + |