rpms/vtk
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport ppc64le inline patch

Browse source
This commit is contained in:
Orion Poplawski 2025-11-26 08:33:07 -07:00
commit cedd757304
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vtk-ppc64-no-always-inline.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/Common/Core/vtkDataArrayMeta.h b/Common/Core/vtkDataArrayMeta.h
index 376244b..9b8f58e 100644
--- a/Common/Core/vtkDataArrayMeta.h
+++ b/Common/Core/vtkDataArrayMeta.h
@@ -43,7 +43,8 @@
#define VTK_ITER_ASSERT(x, msg)
#endif
-#if defined(VTK_ALWAYS_OPTIMIZE_ARRAY_ITERATORS) && !defined(VTK_DEBUG_RANGE_ITERATORS)
+#if (defined(VTK_ALWAYS_OPTIMIZE_ARRAY_ITERATORS) || !defined(VTK_DEBUG_RANGE_ITERATORS)) && \
+ !defined(VTK_COMPILER_MSVC) && !defined(__PPC64__)
#define VTK_ITER_INLINE VTK_ALWAYS_INLINE
#define VTK_ITER_ASSUME VTK_ASSUME_NO_ASSERT
#define VTK_ITER_OPTIMIZE_START VTK_ALWAYS_OPTIMIZE_START

5
vtk.spec
View file

@ -60,6 +60,10 @@ Patch2: vtk-netcdf.patch
Patch3: vtk-AllValues.patch
# CVE-2021-42521 - vtkXMLTreeReader: possible nullptr dereference
Patch4: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9621.patch
# always_inline fails on ppc64le
# https://gitlab.kitware.com/vtk/vtk/-/issues/19622
# https://bugzilla.redhat.com/show_bug.cgi?id=2386242
Patch5: vtk-ppc64-no-always-inline.patch
URL: https://vtk.org/
@ -848,6 +852,7 @@ cat xorg.log
%changelog
* Tue Nov 25 2025 Orion Poplawski <orion@nwra.com> - 9.1.0-20
- Rebuild for gdal (rhbz#2416611)
- Backport ppc64le inline patch
* Tue Jun 24 2025 Orion Poplawski <orion@nwra.com> - 9.1.0-19
- Rebuild for proj 9