Fix CXXFLAGS

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Disable no-type-limits errors
2020-05-25 16:04:41 +03:00 · 2020-05-23 08:51:09 +03:00 · 2020-05-20 19:57:09 +03:00 · 2020-05-20 16:35:51 +03:00 · 2020-05-20 13:47:10 +03:00 · 2020-05-20 13:45:36 +03:00
1 changed files with 12 additions and 3 deletions
--- a/protobuf.spec
+++ b/protobuf.spec
@ -1,14 +1,18 @@
 # Build -python subpackage
 %bcond_without python
 # Build -java subpackage
+%ifnarch riscv64
 %bcond_without java
+%else
+%bcond_with java
+%endif

 #global rcver rc2

 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        3.11.4
-Release:        1%{?dist}
+Release:        1.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
@ -215,7 +219,7 @@ rm -r java/util/src/main/java/com/google/protobuf/util

 # This test is incredibly slow on arm
 # https://github.com/google/protobuf/issues/2389
-%ifarch %{arm} s390x
+%ifarch %{arm} s390x riscv64
 mv java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java \
   java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java.slow
 mv java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java \
@ -229,6 +233,7 @@ rm -f src/solaris/libstdc++.la
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
 mv CONTRIBUTORS.txt.utf8 CONTRIBUTORS.txt
 export PTHREAD_LIBS="-lpthread"
+export CXXFLAGS="%{build_cxxflags} -Wno-type-limits"
 ./autogen.sh
 %configure

@ -241,7 +246,7 @@ popd
 %endif

 %if %{with java}
-%ifarch s390x %{arm}
+%ifarch s390x %{arm} riscv64
 export MAVEN_OPTS=-Xmx1024m
 %endif
 %mvn_build -s -- -f java/pom.xml
@ -361,6 +366,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}


 %changelog
+* Wed May 20 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.11.4-1.0.riscv64
+- Disable slow tests on riscv64
+- Disable java sub-package for riscv64 (build errors)
+
 * Tue Mar 31 2020 Adrian Reber <adrian@lisas.de> - 3.11.4-1
 - Update to 3.11.4
Author	SHA1	Message	Date
David Abdurachmanov	07791f7dbc	Fix CXXFLAGS Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-25 16:04:41 +03:00
David Abdurachmanov	65c2d6762b	Disable no-type-limits errors See: https://github.com/protocolbuffers/protobuf/issues/7514 https://gcc.gnu.org/PR95148 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-23 08:51:09 +03:00
David Abdurachmanov	8eb16a4cfe	Disable java sub-package on riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-20 19:57:09 +03:00
David Abdurachmanov	4f78b5453e	Disable slow tests for now Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-20 16:35:51 +03:00
David Abdurachmanov	2d86c76e0a	Ignore test failures on riscv64 [INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ protobuf-javalite --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 119 source files to /builddir/build/BUILD/protobuf-3.11.4/java/lite/target/test-classes [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] /builddir/build/BUILD/protobuf-3.11.4/java/lite/target/generated-test-sources/com/google/protobuf/TestUtil.java:[2539,51] reached end of file while parsing [INFO] 1 error [INFO] ------------------------------------------------------------- [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Skipping Protocol Buffers [Parent] [INFO] This project has been banned from the build due to previous failures. [INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary for Protocol Buffers [Parent] 3.11.4: [INFO] [INFO] Protocol Buffers [BOM] ............................. SUCCESS [ 0.404 s] [INFO] Protocol Buffers [Parent] .......................... SUCCESS [ 0.268 s] [INFO] Protocol Buffers [Lite] ............................ FAILURE [37:00 min] [INFO] Protocol Buffers [Core] ............................ SKIPPED [INFO] Protocol Buffers [Util] ............................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 39:23 min [INFO] Finished at: 2020-05-20T06:34:46-04:00 [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:testCompile (default-testCompile) on project protobuf-javalite: Compilation failure [ERROR] /builddir/build/BUILD/protobuf-3.11.4/java/lite/target/generated-test-sources/com/google/protobuf/TestUtil.java:[2539,51] reached end of file while parsing [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :protobuf-javalite error: Bad exit status from /var/tmp/rpm-tmp.xFx2Vw (%build) Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-20 13:47:10 +03:00
David Abdurachmanov	3aee0e6c62	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2020-05-20 13:45:36 +03:00
David Abdurachmanov	655cc8d61c	Merge remote-tracking branch 'up/f29' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-09-01 11:19:31 +02:00
David Abdurachmanov	2286d99952	Temporary disable Java We cannot install Maven packages at this point due to cycling dep. Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-21 09:39:48 +02:00