Add support for riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
cad8fd9101
commit
3fd6f7c8cf
|
@ -4,11 +4,13 @@
|
|||
# compared to the pure-Python implementation.
|
||||
%bcond_without python_cpp
|
||||
# Build -java subpackage
|
||||
%ifnarch riscv64
|
||||
%ifarch %{java_arches}
|
||||
%bcond_without java
|
||||
%else
|
||||
%bcond_with java
|
||||
%endif
|
||||
%endif
|
||||
|
||||
#global rcver rc2
|
||||
|
||||
|
@ -19,7 +21,7 @@ Name: protobuf
|
|||
# “patch” updates of protobuf.
|
||||
Version: 3.19.6
|
||||
%global so_version 30
|
||||
Release: 2%{?dist}
|
||||
Release: 2.0.riscv64%{?dist}
|
||||
|
||||
# The entire source is BSD-3-Clause, except the following files, which belong
|
||||
# to the build system; are unpackaged maintainer utility scripts; or are used
|
||||
|
@ -105,6 +107,7 @@ BuildRequires: gcc-c++
|
|||
BuildRequires: emacs
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
%ifnarch riscv64
|
||||
%ifnarch %{java_arches}
|
||||
Obsoletes: %{name}-java-util < 3.19.4-4
|
||||
Obsoletes: %{name}-javadoc < 3.19.4-4
|
||||
|
@ -112,6 +115,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
|
||||
|
@ -361,7 +365,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
|
||||
|
@ -374,7 +378,7 @@ export MAVEN_OPTS=-Xmx1024m
|
|||
|
||||
%check
|
||||
# Java tests fail on s390x
|
||||
%ifarch s390x
|
||||
%ifarch s390x riscv64
|
||||
fail=0
|
||||
%else
|
||||
fail=1
|
||||
|
@ -497,6 +501,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.19.6-2.0.riscv64
|
||||
- Enable riscv64
|
||||
- Disable java subpackages for riscv64 (takes too long to build)
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue