Compare commits

...

2 Commits

Author SHA1 Message Date
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
2 changed files with 40 additions and 2 deletions

29
VTK-7.1.1-riscv64.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h b/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h
index 3626361..2050da1 100644
--- a/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h
+++ b/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h
@@ -467,6 +467,10 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
#elif defined(__XTENSA_EL__)
# 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 383785a..af306e5 100644
--- a/Wrapping/Tools/vtkParsePreprocess.c
+++ b/Wrapping/Tools/vtkParsePreprocess.c
@@ -2706,6 +2706,9 @@ void vtkParsePreprocess_AddStandardMacros(
#ifdef __xtensa__
PREPROC_ADD_MACRO(info, __xtensa__);
#endif
+#ifdef __riscv
+ PREPROC_ADD_MACRO(info, __riscv);
+#endif
/*------------------------------
* compiler macros

View File

@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 7.1.1
Release: 12%{?dist}
Release: 12.1.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
@ -30,6 +30,8 @@ Patch0: vtk-format.patch
# Fix tcl library loading
# http://www.vtk.org/Bug/view.php?id=15279
Patch5: vtk-tcllib.patch
# Support for RISC-V (riscv64)
Patch6: VTK-7.1.1-riscv64.patch
URL: http://vtk.org/
@ -461,6 +463,7 @@ programming languages.
%setup -q -b 1 -n VTK-%{version}
%patch0 -p1 -b .format
%patch5 -p1 -b .tcllib
%patch6 -p1 -b .riscv64
# Remove included thirdparty sources just to be sure
# TODO - alglib - http://www.vtk.org/Bug/view.php?id=15729
# TODO - vtkexodusII - not yet packaged
@ -490,7 +493,7 @@ export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
%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
@ -951,6 +954,12 @@ cat xorg.log
%changelog
* Mon Oct 08 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 7.1.1-12.1.riscv64
- Avoid java.lang.OutOfMemoryError on RISC-V (riscv64)
* Mon Oct 08 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 7.1.1-12.0.riscv64
- Add support for RISC-V (riscv64)
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild