Add some --add-opens option for java17
Restrict heap usage for mvn also on %ix86
This commit is contained in:
parent
73fd95e79a
commit
26e8f8ada1
10
protobuf-3.19.4-jre17-add-opens.patch
Normal file
10
protobuf-3.19.4-jre17-add-opens.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- protobuf-3.19.4/java/pom.xml.jre17 2022-02-13 11:45:39.367028268 +0900
|
||||||
|
+++ protobuf-3.19.4/java/pom.xml 2022-02-13 12:43:18.212542147 +0900
|
||||||
|
@@ -37,6 +37,7 @@
|
||||||
|
<test.proto.dir>src/test/proto</test.proto.dir>
|
||||||
|
<generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir>
|
||||||
|
<generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir>
|
||||||
|
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<licenses>
|
@ -8,7 +8,7 @@
|
|||||||
Summary: Protocol Buffers - Google's data interchange format
|
Summary: Protocol Buffers - Google's data interchange format
|
||||||
Name: protobuf
|
Name: protobuf
|
||||||
Version: 3.19.4
|
Version: 3.19.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/protocolbuffers/protobuf
|
URL: https://github.com/protocolbuffers/protobuf
|
||||||
Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz
|
Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz
|
||||||
@ -21,6 +21,11 @@ Source3: https://github.com/google/googletest/archive/5ec7f0c4a113e2f18ac
|
|||||||
Patch1: protobuf-3.14-disable-IoTest.LargeOutput.patch
|
Patch1: protobuf-3.14-disable-IoTest.LargeOutput.patch
|
||||||
# Disable tests that are failing on 32bit systems
|
# Disable tests that are failing on 32bit systems
|
||||||
Patch2: disable-tests-on-32-bit-systems.patch
|
Patch2: disable-tests-on-32-bit-systems.patch
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2051202
|
||||||
|
# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain)
|
||||||
|
# throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @12d5624a
|
||||||
|
# at com.google.protobuf.ServiceTest.testGetPrototype(ServiceTest.java:107)
|
||||||
|
Patch3: protobuf-3.19.4-jre17-add-opens.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -211,6 +216,7 @@ descriptions in the Emacs editor.
|
|||||||
# Need to disable more tests that fail on 32bit arches only
|
# Need to disable more tests that fail on 32bit arches only
|
||||||
%patch2 -p0
|
%patch2 -p0
|
||||||
%endif
|
%endif
|
||||||
|
%patch3 -p1 -b .jre17
|
||||||
mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/
|
mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/
|
||||||
find -name \*.cc -o -name \*.h | xargs chmod -x
|
find -name \*.cc -o -name \*.h | xargs chmod -x
|
||||||
chmod 644 examples/*
|
chmod 644 examples/*
|
||||||
@ -267,7 +273,7 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
%ifarch s390x %{arm}
|
%ifarch %ix86 s390x %{arm}
|
||||||
export MAVEN_OPTS=-Xmx1024m
|
export MAVEN_OPTS=-Xmx1024m
|
||||||
%endif
|
%endif
|
||||||
%pom_disable_module kotlin java/pom.xml
|
%pom_disable_module kotlin java/pom.xml
|
||||||
@ -390,6 +396,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Feb 13 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.19.4-2
|
||||||
|
- Add some --add-opens option for java17
|
||||||
|
- Restrict heap usage for mvn also on %%ix86
|
||||||
|
|
||||||
* Mon Feb 07 2022 Orion Poplawski <orion@nwra.com> - 3.19.4-1
|
* Mon Feb 07 2022 Orion Poplawski <orion@nwra.com> - 3.19.4-1
|
||||||
- Update to 3.19.4
|
- Update to 3.19.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user