pool/vtk
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4809cbcd8f
vtk/vtk-Rinterface-uintptr_t.patch

27 lines
1.1 KiB
Diff
Raw Normal View History

Accepting request 418326 from home:badshah400:branches:science - 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
2016-08-12 21:48:48 +02:00
Index: VTK-7.0.0/Filters/StatisticsGnuR/CMakeLists.txt
Accepting request 360188 from home:badshah400:branches:science Update to version 7.0.0 (mention new patch in changelog). OBS-URL: https://build.opensuse.org/request/show/360188 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=67
2016-02-21 13:14:22 +01:00
===================================================================
Accepting request 418326 from home:badshah400:branches:science - 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
2016-08-12 21:48:48 +02:00
--- 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})
Accepting request 360188 from home:badshah400:branches:science Update to version 7.0.0 (mention new patch in changelog). OBS-URL: https://build.opensuse.org/request/show/360188 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=67
2016-02-21 13:14:22 +01:00
Accepting request 418326 from home:badshah400:branches:science - 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
2016-08-12 21:48:48 +02:00
add_definitions(-DVTK_BUILDING_FILTERS_STATISTICSGNUR)
Accepting request 360188 from home:badshah400:branches:science Update to version 7.0.0 (mention new patch in changelog). OBS-URL: https://build.opensuse.org/request/show/360188 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=67
2016-02-21 13:14:22 +01:00
Accepting request 418326 from home:badshah400:branches:science - 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
2016-08-12 21:48:48 +02:00
+# Check for the existance of uintptr_t type and set the HAVE_UINTPTR_T macro
+include(CheckTypeSize)
+CHECK_TYPE_SIZE(uintptr_t UINTPTR_T)
Accepting request 360188 from home:badshah400:branches:science Update to version 7.0.0 (mention new patch in changelog). OBS-URL: https://build.opensuse.org/request/show/360188 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=67
2016-02-21 13:14:22 +01:00
+
Accepting request 418326 from home:badshah400:branches:science - 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
2016-08-12 21:48:48 +02:00
# 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
Accepting request 360188 from home:badshah400:branches:science Update to version 7.0.0 (mention new patch in changelog). OBS-URL: https://build.opensuse.org/request/show/360188 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=67
2016-02-21 13:14:22 +01:00
Accepting request 418326 from home:badshah400:branches:science - 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
2016-08-12 21:48:48 +02:00
#endif
Reference in New Issue Copy Permalink