rpms/protobuf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove conditionals for retired 32-bit ARM architecture

Browse Source
This commit is contained in:
Benjamin A. Beasley 2023-04-25 18:04:26 -04:00
parent d9b300eb78
commit c6adfcb5f6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protobuf.spec
View File

@ -289,7 +289,7 @@ descriptions in the Emacs editor.
%prep %prep
%setup -q -n %{name}-%{version}%{?rcver} -a 3 %setup -q -n %{name}-%{version}%{?rcver} -a 3
%ifarch %{ix86} armv7hl %ifarch %{ix86}
# IoTest.LargeOutput fails on 32bit arches # IoTest.LargeOutput fails on 32bit arches
# https://github.com/protocolbuffers/protobuf/issues/8082 # https://github.com/protocolbuffers/protobuf/issues/8082
%patch1 -p1 %patch1 -p1
@ -328,7 +328,7 @@ find -name '*.java' | xargs sed -ri \
# This test is incredibly slow on arm # This test is incredibly slow on arm
# https://github.com/google/protobuf/issues/2389 # https://github.com/google/protobuf/issues/2389
%ifarch %{arm} s390x %ifarch s390x
mv java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java \ mv java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java \
java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java.slow java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java.slow
mv java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java \ mv java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java \
@ -359,7 +359,7 @@ popd
%endif %endif
%if %{with java} %if %{with java}
%ifarch %ix86 s390x %{arm} %ifarch %{ix86} s390x
export MAVEN_OPTS=-Xmx1024m export MAVEN_OPTS=-Xmx1024m
%endif %endif
%pom_disable_module kotlin java/pom.xml %pom_disable_module kotlin java/pom.xml
@ -371,13 +371,7 @@ export MAVEN_OPTS=-Xmx1024m
%check %check
# Java tests fail on s390x %make_build check CXXFLAGS="%{build_cxxflags} -Wno-error=type-limits"
%ifarch s390x
fail=0
%else
fail=1
%endif
%make_build check CXXFLAGS="%{build_cxxflags} -Wno-error=type-limits" || exit $fail
%install %install
@ -498,6 +492,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
* Tue Apr 25 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 3.19.6-3 * Tue Apr 25 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 3.19.6-3
- Remove unnecessary explicit pkgconfig dependencies - Remove unnecessary explicit pkgconfig dependencies
- Remove an obsolete workaround for failing Java tests - Remove an obsolete workaround for failing Java tests
- Remove conditionals for retired 32-bit ARM architecture
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.6-2 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild