rpms
/
vtk
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'up/main' into main-riscv64 

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-06-07 17:23:59 +03:00
parent def598a510 e1b8d18b96
commit 39a705958d
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vtk.spec
View File

@ -54,7 +54,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 9.2.6
Release: 11.0.riscv64%{?dist}
Release: 15.0.riscv64%{?dist}
License: BSD-3-Clause
Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz
Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz
@ -146,7 +146,9 @@ BuildRequires: gnuplot
BuildRequires: wget
%if %{with mpich}
BuildRequires: mpich-devel
%ifnarch %{ix86}
BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich
%endif
BuildRequires: netcdf-mpich-devel
%endif
%if %{with openmpi}
@ -557,9 +559,14 @@ find vtk-examples -type f | xargs chmod -R a-x
%endif \
%if %{with java} \
-DVTK_WRAP_JAVA:BOOL=ON \\\
-DVTK_JAVA_SOURCE_VERSION=8 \\\
-DVTK_JAVA_TARGET_VERSION=8 \\\
-DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
-DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\
-DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
-DJAVA_AWT_LIBRARY:PATH=$JAVA_HOME/lib/libjawt.so \\\
-DJAVA_JNI_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
-DJAVA_JVM_LIBRARY:PATH=$JAVA_HOME/lib/libjava.so \\\
%else \
-DVTK_WRAP_JAVA:BOOL=OFF \\\
%endif \
@ -587,12 +594,12 @@ export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
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
export JAVA_HOME=%{_prefix}/lib/jvm/java
%ifarch %{arm} s390x riscv64
# getting "java.lang.OutOfMemoryError: Java heap space" during the build
export JAVA_TOOL_OPTIONS=-Xmx2048m
%endif
%ifarch %{arm} riscv64
%ifarch %{arm}
# Likely running out of memory during build
%global _smp_ncpus_max 2
%endif
@ -842,8 +849,23 @@ cat xorg.log
%changelog
* Thu Dec 07 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-11.0.riscv64
- Disable Java for riscv64 to bootstrap
* Fri Jun 07 2024 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-15.0.riscv64
- Allow more threads
* Mon May 13 2024 Sandro Mani <manisandro@gmail.com> - 9.2.6-15
- Rebuild (gdal)
* Wed Apr 10 2024 Orion Poplawski <orion@nwra.com> - 9.2.6-14
- Set Java source/target version to 8 (FTBFS bz#2272954)
* Sat Feb 24 2024 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-13
- Reduce memory and ncpu usage during riscv64 builds
* Wed Jan 24 2024 Orion Poplawski <orion@nwra.com> - 9.2.6-12
- Drop mpi4py-mpich BR on i686 (bz#2259594)
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 9.2.6-12
- Rebuilt for Boost 1.83
* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 9.2.6-11
- Rebuild (gdal)