Enable riscv64

Bootstrap, rebuild and enable all the bits later on.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2022-10-19 16:05:50 +03:00
parent 6c8d4c7752
commit ca9cea1a07
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 11 additions and 3 deletions

View File

@ -8,18 +8,20 @@
%bcond_without python_cpp
%endif
# Build -java subpackage
%ifnarch riscv64
%ifarch %{java_arches}
%bcond_without java
%else
%bcond_with java
%endif
%endif
#global rcver rc2
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
Version: 3.19.4
Release: 6%{?dist}
Release: 6.0.riscv64%{?dist}
License: BSD
URL: https://github.com/protocolbuffers/protobuf
Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz
@ -47,6 +49,7 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: zlib-devel
%ifnarch riscv64
%ifnarch %{java_arches}
Obsoletes: %{name}-java-util < 3.19.4-4
Obsoletes: %{name}-javadoc < 3.19.4-4
@ -54,6 +57,7 @@ Obsoletes: %{name}-parent < 3.19.4-4
Obsoletes: %{name}-bom < 3.19.4-4
Obsoletes: %{name}-javalite < 3.19.4-4
%endif
%endif
%description
Protocol Buffers are a way of encoding structured data in an efficient
@ -296,7 +300,7 @@ popd
%endif
%if %{with java}
%ifarch %ix86 s390x %{arm}
%ifarch %ix86 s390x %{arm} riscv64
export MAVEN_OPTS=-Xmx1024m
%endif
%pom_disable_module kotlin java/pom.xml
@ -309,7 +313,7 @@ export MAVEN_OPTS=-Xmx1024m
%check
# Java tests fail on s390x
%ifarch s390x
%ifarch s390x riscv64
fail=0
%else
fail=1
@ -427,6 +431,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
%changelog
* Wed Oct 19 2022 David Abdurachmanov <davidlt@rivosinc.com> - 3.19.4-6.0.riscv64
- Enable riscv64
- Disable java for riscv64 for now (takes long time to build)
* Sun Aug 14 2022 Orion Poplawski <orion@nwra.com> - 3.19.4-6
- Build python support with C++ (bz#2107921)