Remove obsolete patch

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Merge remote-tracking branch 'up/master' into master-riscv64
2020-07-07 20:55:25 +03:00 · 2020-07-07 20:54:45 +03:00 · 2020-04-27 13:43:24 +03:00 · 2020-04-26 17:18:32 +03:00 · 2020-04-26 13:20:11 +03:00 · 2020-04-26 13:04:21 +03:00
2 changed files with 39 additions and 2 deletions
--- a/VTK-8.2.0-riscv64.patch
+++ b/VTK-8.2.0-riscv64.patch
@ -0,0 +1,29 @@
+diff --git a/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h b/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h
+index 546bacd0..b188f8f2 100644
+--- a/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h
+++ b/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h
+@@ -471,6 +471,10 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
+ #elif defined(__riscv__)
+ # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
+ 
+/* RISC-V */
+#elif defined(__riscv)
+# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
+
+ /* Unknown CPU */
+ #elif !defined(KWIML_ABI_NO_ERROR_ENDIAN)
+ # error "Byte order of target CPU unknown."
+diff --git a/Wrapping/Tools/vtkParsePreprocess.c b/Wrapping/Tools/vtkParsePreprocess.c
+index 539a953f..8d92db95 100644
+--- a/Wrapping/Tools/vtkParsePreprocess.c
+++ b/Wrapping/Tools/vtkParsePreprocess.c
+@@ -2705,6 +2705,9 @@ void vtkParsePreprocess_AddStandardMacros(
+ #ifdef __xtensa__
+     PREPROC_ADD_MACRO(info, __xtensa__);
+ #endif
+#ifdef __riscv
+    PREPROC_ADD_MACRO(info, __riscv);
+#endif
+ 
+     /*------------------------------
+      * compiler macros
--- a/vtk.spec
+++ b/vtk.spec
@ -24,7 +24,7 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 8.2.0
-Release: 17%{?dist}
+Release: 17.0.riscv64%{?dist}
 # This is a variant BSD license, a cross between BSD and ZLIB.
 # For all intents, it has the same rights and restrictions as BSD.
 # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
@ -37,10 +37,14 @@ Source3: FindPEGTL.cmake
 Patch0: https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch
 # Proj 6 support
 Patch1: vtk-proj6_compat.patch
+
 # GCC 10 support based on:
 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420
 Patch2: vtk-gcc10.patch

+# Support for RISC-V (riscv64)
+Patch10: VTK-8.2.0-riscv64.patch
+
 URL: http://vtk.org/

 BuildRequires: cmake
@ -463,6 +467,7 @@ programming languages.
 %patch0 -p1 -b .py38
 %patch1 -p1 -b .proj6
 %patch2 -p1 -b .gcc10
+%patch10 -p1 -b .riscv64
 # Remove included thirdparty sources just to be sure
 # TODO - diy2 - not yet packaged
 # TODO - exodusII - not yet packaged
@ -496,7 +501,7 @@ export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
 export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 %if %{with java}
 export JAVA_HOME=/usr/lib/jvm/java
-%ifarch %{arm} s390x
+%ifarch %{arm} s390x riscv64
 # getting "java.lang.OutOfMemoryError: Java heap space" during the build
 export JAVA_TOOL_OPTIONS=-Xmx2048m
 %endif
@ -868,6 +873,9 @@ cat xorg.log


 %changelog
+* Tue Jul 07 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 8.2.0-13.0.riscv64
+- Add support for RISC-V (riscv64)
+
 * Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 8.2.0-17
 - Rebuild for hdf5 1.10.6
Author	SHA1	Message	Date
David Abdurachmanov	31e7b14506	Remove obsolete patch Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-07-07 20:55:25 +03:00
David Abdurachmanov	63bcdc125d	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-07-07 20:54:45 +03:00
David Abdurachmanov	06355f3d1f	Add GCC 10 support in VTKGenerateExportHeader.cmake Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-04-27 13:43:24 +03:00
David Abdurachmanov	3fd3a5b1ee	Fix 6420.patch Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-04-26 17:18:32 +03:00
David Abdurachmanov	acef3e4498	Rebase 6420 patch Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-04-26 13:20:11 +03:00
David Abdurachmanov	82401f4ca5	Fix GCC 10 compilation errors https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420 make[2]: Leaving directory '/builddir/build/BUILD/VTK-8.2.0/build' /usr/bin/ld: CMakeFiles/vtkexodusII.dir/src/ex_open_par.c.o:/builddir/build/BUILD/VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c:477: multiple definition of `exodus_unused_symbol_dummy_1'; CMakeFiles/vtkexodusII.dir/src/ex_create_par.c.o:/builddir/build/BUILD/VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c:617: first defined here collect2: error: ld returned 1 exit status make[2]: * [ThirdParty/exodusII/vtkexodusII/CMakeFiles/vtkexodusII.dir/build.make:4153: lib/libvtkexodusII.so.1] Error 1 make[1]: * [CMakeFiles/Makefile2:18284: ThirdParty/exodusII/vtkexodusII/CMakeFiles/vtkexodusII.dir/all] Error 2 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-04-26 13:04:21 +03:00
David Abdurachmanov	07575d2d5e	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-04-25 22:21:00 +03:00
David Abdurachmanov	a84dace056	Rebase riscv patch Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2019-07-25 19:00:57 +03:00
David Abdurachmanov	cef2095caf	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2019-07-25 18:37:15 +03:00
David Abdurachmanov	361df498b2	Avoid java.lang.OutOfMemoryError on RISC-V (riscv64) Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-10-20 09:30:48 +02:00
David Abdurachmanov	3b02d97280	Add support for RISC-V (riscv64) Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-10-08 11:50:57 +03:00