diff options
author | 2021-06-03 18:52:37 +0200 | |
---|---|---|
committer | 2021-06-10 03:37:44 +0000 | |
commit | 2728a6a5f2c0a39f44ceee464a764bec6da2c320 (patch) | |
tree | 7724399d34277f25de3eb3eaaaad8040c269e58a /sci-libs/vtk/files | |
parent | sci-libs/vtk: add python-3.9 support (diff) | |
download | gentoo-2728a6a5f2c0a39f44ceee464a764bec6da2c320.tar.gz gentoo-2728a6a5f2c0a39f44ceee464a764bec6da2c320.tar.bz2 gentoo-2728a6a5f2c0a39f44ceee464a764bec6da2c320.zip |
sci-libs/vtk: improve all-modules USE flag
- add missing flags to REQUIRED_USE
- add new mysql USE flag - needed by all-modules, adds new dependency on
dev-db/mysql-connector-c. Dev-db/mariadb-connector-c isn't supported
by this version. Fix an issue with using of deprecated my_bool when
using mysql-connector-c.
- remove xdmf2 USE flag, block sci-libs/xdmf2 with all-modules:
sci-libs/xdmf2 doesn't ship any cmake configuration files, which leads
to configuration errors when trying to build against external xdmf2
- block sci-libs/xdmf2: when built against internal xdmf2, there are header
file collisions with the header files installed by sci-libs/xdmf2
- add dependency on sci-libs/kissfft, bug #754684) and drop bundled
- fix an issue with xdmf3 library being installed in both library locations,
lib and lib64
- fix QA issues with RPATH
- byte compile python files
- disable searching for zfp (no package in tree)
- addresses some QA issues with defined but unused cmake variables: fixing all
of them would need a thorough testing of each single USE flag and checking
where these belong to, in this over-complex build system (bug #660582)
Closes: https://bugs.gentoo.org/793839
Closes: https://bugs.gentoo.org/754684
Closes: https://bugs.gentoo.org/646846
Bug: https://bugs.gentoo.org/660582
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs/vtk/files')
-rw-r--r-- | sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch new file mode 100644 index 000000000000..d03cab326f4f --- /dev/null +++ b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch @@ -0,0 +1,57 @@ +From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Thu, 3 Jun 2021 13:13:38 +0200 +Subject: [PATCH] fix library installation dir for xdmf3 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt +index 86d688f8..7d009dfe 100644 +--- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt ++++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt +@@ -269,10 +269,10 @@ endif() + + if(UNIX) + if (BUILD_SHARED_LIBS) +- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so ++ set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.so + PARENT_SCOPE) + else() +- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.a ++ set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.a + PARENT_SCOPE) + endif() + endif() +@@ -297,13 +297,13 @@ if (NOT XDMF_INSTALL_NO_DEVELOPMENT) + endif() + install(TARGETS XdmfCore + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS) + install(TARGETS XdmfCore_Static + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + endif () + + if (Boost_FOUND) +@@ -329,7 +329,7 @@ set(XdmfCore_INCLUDE_DIRS + CACHE INTERNAL "") + + set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE) +-set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib) ++set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE) + set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin) + +-- +2.31.1 + |