pool/vtk
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 418326 from home:badshah400:branches:science

Browse Source 
- 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
This commit is contained in:
Matthias Mailänder 2016-08-12 19:48:48 +00:00 committed by Git OBS Bridge
parent b11ed816df
commit 92da3ef714
3 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vtk-Rinterface-uintptr_t.patch
View File

@ -1,25 +1,26 @@
Index: VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx
Index: VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt
===================================================================
--- VTK-7.0.0.orig/Filters/StatisticsGnuR/vtkRInterface.cxx
+++ VTK-7.0.0/Filters/StatisticsGnuR/vtkRInterface.cxx
@@ -20,12 +20,15 @@
--- 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})
#include "vtkRInterface.h"
add_definitions(-DVTK_BUILDING_FILTERS_STATISTICSGNUR)
+// uintptr_t is already defined in recent versions of R which therefore causes a
+// clash when the same symbol is redefined in stddef.h
+# Check for the existance of uintptr_t type and set the HAVE_UINTPTR_T macro
+include(CheckTypeSize)
+CHECK_TYPE_SIZE(uintptr_t UINTPTR_T)
+
// for uintptr_t
-#ifdef _MSC_VER
-#include <stddef.h>
-#else
-#include <stdint.h>
-#endif
+// #ifdef _MSC_VER
+// #include <stddef.h>
+// #else
+// #include <stdint.h>
+// #endif
# 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
#include "vtkInformation.h"
#include "vtkInformationVector.h"
#define VTK_R_HOME "@R_HOME@"
+#cmakedefine HAVE_UINTPTR_T
#endif

13
vtk.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Aug 10 00:56:56 UTC 2016 - badshah400@gmail.com
- 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.
-------------------------------------------------------------------
Wed Apr 13 11:32:12 UTC 2016 - badshah400@gmail.com

4
vtk.spec
View File

@ -32,7 +32,7 @@ Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz
Source1: vtk-rpmlintrc
# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400@gmail.com -- Fix file containing DATE and TIME
Patch1: vtk-fix-file-contains-date-time.patch
# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch badshah400@gmail.com -- Only use uintptr_t definition from R headers; no longer include stdint.h
# PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386 badshah400@gmail.com -- Fix issues with uintptr_t redefinition by defining the HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t, which is already defined in stdint.h called earlier; patch sent upstream
Patch2: vtk-Rinterface-uintptr_t.patch
# PATCH-FIX-UPSTREAM vtk-gcc6.patch dmueller@suse.com -- Fix compilation with GCC >= 6.0
Patch3: vtk-gcc6.patch
@ -320,7 +320,7 @@ cmake .. \
-DVTK_Group_Views:BOOL=ON \
-DModule_vtkFiltersStatisticsGnuR:BOOL=ON \
-DVTK_WRAP_TCL:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON \
-DVTK_PYTHON_VERSION=3 \
-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON