rpms/vtk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link libvtkkissfft.so.1 against libm (bz#2100573)

Browse Source
This commit is contained in:
Orion Poplawski 2022-06-24 21:18:51 -06:00
parent 344d7f95d4
commit 794f8053f0
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtk-kissfft-libm.patch Normal file
View File

@ -0,0 +1,11 @@
diff -ru VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt
--- VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2021-11-04 13:48:20.000000000 -0600
+++ VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2022-06-20 10:08:06.000000000 -0600
@@ -40,3 +40,7 @@
target_include_directories(kissfft
PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
+
+if (UNIX)
+ vtk_module_link(VTK::kissfft PRIVATE m)
+endif ()

4
vtk.spec
View File

@ -45,6 +45,8 @@ Source1: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz
Source2: xorg.conf Source2: xorg.conf
# Patch required libharu version (Fedora 33+ contains the needed VTK patches) # Patch required libharu version (Fedora 33+ contains the needed VTK patches)
Patch0: vtk-libharu.patch Patch0: vtk-libharu.patch
# Upstream patch to link kissfft with libm
Patch1: vtk-kissfft-libm.patch
# Duplicate define conflict with Xutil, see: # Duplicate define conflict with Xutil, see:
# https://gitlab.kitware.com/vtk/vtk/-/issues/18048 # https://gitlab.kitware.com/vtk/vtk/-/issues/18048
Patch3: vtk-AllValues.patch Patch3: vtk-AllValues.patch
@ -463,6 +465,7 @@ programming languages.
%prep %prep
%setup -q -b 1 -n VTK-%{version} %setup -q -b 1 -n VTK-%{version}
%patch0 -p1 -b .libharu %patch0 -p1 -b .libharu
%patch1 -p1 -b .kissfft-libm
%patch3 -p1 -b .AllValues %patch3 -p1 -b .AllValues
# Remove included thirdparty sources just to be sure # Remove included thirdparty sources just to be sure
# TODO - diy2 - not yet packaged # TODO - diy2 - not yet packaged
@ -823,6 +826,7 @@ cat xorg.log
%changelog %changelog
* Fri Jun 24 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-12 * Fri Jun 24 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-12
- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) - Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611)
- Link libvtkkissfft.so.1 against libm (bz#2100573)
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 9.1.0-11 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 9.1.0-11
- Rebuilt for Python 3.11 - Rebuilt for Python 3.11