92da3ef714
- Refresh vtk-Rinterface-uintptr_t.patch to fix further issues with uintptr_t redefinition by defining the HAVE_UINTPTR_T macro using cmake functions; removing the #include of stdint.h is not needed any more since we will not be using the defs from Rinterface.h anyway (boo#985386). Although this really causes a build failure for the i586 arch, where the redefinition of unitptr_t in Rinterface.h conflicts with the stdint.h defintion, the patch is applied generally because the redefinition is not needed in any case. Patch sent upstream. OBS-URL: https://build.opensuse.org/request/show/418326 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=77
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
Index: VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt
|
|
===================================================================
|
|
--- VTK-7.0.0.orig/Filters/StatisticsGnuR/CMakeLists.txt
|
|
+++ VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt
|
|
@@ -16,6 +16,10 @@ include_directories(${R_INCLUDE_DIR})
|
|
|
|
add_definitions(-DVTK_BUILDING_FILTERS_STATISTICSGNUR)
|
|
|
|
+# Check for the existance of uintptr_t type and set the HAVE_UINTPTR_T macro
|
|
+include(CheckTypeSize)
|
|
+CHECK_TYPE_SIZE(uintptr_t UINTPTR_T)
|
|
+
|
|
# Configure the module specific settings into a module configured header.
|
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkFiltersStatisticsGnuRConfigure.h.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/vtkFiltersStatisticsGnuRConfigure.h)
|
|
Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
|
|
===================================================================
|
|
--- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
|
|
+++ VTK-7.0.0/Filters/StatisticsGnuR/vtkFiltersStatisticsGnuRConfigure.h.in
|
|
@@ -17,5 +17,6 @@
|
|
#define vtkFiltersStatisticsGnuRConfigure_h
|
|
|
|
#define VTK_R_HOME "@R_HOME@"
|
|
+#cmakedefine HAVE_UINTPTR_T
|
|
|
|
#endif
|