diff options
author | Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-09-29 07:18:39 +0200 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2022-12-12 08:08:29 +0200 |
commit | 588025882a58b613f5ef08e02b96efbb7d4c7445 (patch) | |
tree | d29368b86f61d7594baa14e86ef9614daadcd69b /sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch | |
parent | dev-python/gpep517: Bump to v13 (diff) | |
download | gentoo-588025882a58b613f5ef08e02b96efbb7d4c7445.tar.gz gentoo-588025882a58b613f5ef08e02b96efbb7d4c7445.tar.bz2 gentoo-588025882a58b613f5ef08e02b96efbb7d4c7445.zip |
sci-libs/vtk: add 9.2.2
- add a new function to check memory and disk space requirements
- don't drop bundled external libraries, it's only a few MB which are freed
through this and upstream does a good job to avoid automagic deps
- request more modules to build explicitly depending on USE flag settings
- don't export CC and friends with USE=mpi, package builds fine with gcc and still
links to MPI libraries
- add USE flag to build vtk-m optional
Bug: https://bugs.gentoo.org/793221
Bug: https://bugs.gentoo.org/835659
Bug: https://bugs.gentoo.org/880759
Closes: https://bugs.gentoo.org/820593
Closes: https://bugs.gentoo.org/827310
Closes: https://bugs.gentoo.org/846374
Closes: https://bugs.gentoo.org/874798
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28250
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch')
-rw-r--r-- | sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch b/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch new file mode 100644 index 000000000000..c47bced20f22 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.2.2-VTKm-respect-user-CXXFLAGS.patch @@ -0,0 +1,81 @@ +From 225a077898eb714e5ecb80255796aa70625e6cea Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 12 Nov 2022 02:01:35 +0100 +Subject: [PATCH] VTKm respect user CXXFLAGS + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/Accelerators/Vtkm/Core/CMakeLists.txt ++++ b/Accelerators/Vtkm/Core/CMakeLists.txt +@@ -79,6 +79,16 @@ if (TARGET vtkm::cuda) + vtk_module_set_properties(VTK::AcceleratorsVTKmCore + LANGUAGE CUDA + CUDA_SEPARABLE_COMPILATION ON) ++ ++ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) ++ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) ++ set(cxx_flags -Wall) ++ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) ++ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) ++ endforeach() ++ vtk_module_compile_options(VTK::AcceleratorsVTKmCore ++ PUBLIC ++ ${cxx_flags}) + endif() + + if (MSVC) +--- a/Accelerators/Vtkm/DataModel/CMakeLists.txt ++++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt +@@ -89,6 +89,16 @@ if (TARGET vtkm::cuda) + + vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel + PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>) ++ ++ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) ++ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) ++ set(cxx_flags -Wall) ++ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) ++ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) ++ endforeach() ++ vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel ++ PUBLIC ++ ${cxx_flags}) + endif () + + if (MSVC) +--- a/Accelerators/Vtkm/Filters/CMakeLists.txt ++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt +@@ -138,6 +138,16 @@ if (TARGET vtkm::cuda) + + vtk_module_compile_options(VTK::AcceleratorsVTKmFilters + PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>) ++ ++ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) ++ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) ++ set(cxx_flags -Wall) ++ foreach(cmake_cxx_flag ${cmake_cxx_flags_list}) ++ list(APPEND cxx_flags $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${cmake_cxx_flag}>) ++ endforeach() ++ vtk_module_compile_options(VTK::AcceleratorsVTKmFilters ++ PUBLIC ++ ${cxx_flags}) + endif () + + if (MSVC) +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmCompilerFlags.cmake ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmCompilerFlags.cmake +@@ -126,6 +126,12 @@ elseif(VTKM_COMPILER_IS_ICC) + elseif(VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG) + set(cxx_flags -Wall -Wcast-align -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused -fno-common -Wno-unused-function) + set(cuda_flags -Xcompiler=-Wall,-Wcast-align,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-fno-common,-Wunused,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-function) ++ string(STRIP ${CMAKE_CXX_FLAGS} _cmake_cxx_flags) ++ string(REPLACE " " ";" cmake_cxx_flags_list ${_cmake_cxx_flags}) ++ foreach(elem ${cmake_cxx_flags_list}) ++ list(PREPEND cxx_flags ${elem}) ++ list(PREPEND cuda_flags -Xcompiler=${elem}) ++ endforeach() + + #Clang does not support the -Wchar-subscripts flag for warning if an array + #subscript has a char type. +-- +2.38.1 + |