Merge remote-tracking branch 'up/f31' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Add support for RISC-V (riscv64)
2019-08-20 09:44:35 -07:00 · 2018-06-20 11:51:58 +02:00
1 changed files with 7 additions and 2 deletions
--- a/octave.spec
+++ b/octave.spec
@ -22,7 +22,7 @@
 Name:           octave
 Epoch:          6
 Version:        5.1.0
-Release:        2%{?rcver:.rc%{rcver}}%{?dist}
+Release:        2%{?rcver:.rc%{rcver}}.0.riscv64%{?dist}
 Summary:        A high-level language for numerical computations
 License:        GPLv3+
 URL:            http://www.octave.org
@ -316,7 +316,7 @@ do
 ARCH=\$(uname -m)

 case \$ARCH in
-x86_64 | ia64 | s390x | aarch64 | ppc64 | ppc64le) LIB_DIR=/usr/lib64
+x86_64 | ia64 | s390x | aarch64 | ppc64 | ppc64le | riscv64) LIB_DIR=/usr/lib64
                       SECONDARY_LIB_DIR=/usr/lib
                       ;;
 * )
@ -361,7 +361,9 @@ fi
 $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf :99 &
 sleep 2
 export DISPLAY=:99
+%ifnarch riscv64
 make check %{?el7:|| :}
+%endif

 %ldconfig_scriptlets

@ -410,6 +412,9 @@ make check %{?el7:|| :}
 %{_pkgdocdir}/refcard*.pdf

 %changelog
+* Tue Aug 20 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 6:5.1.0-2.0.riscv64
+- Disable tests on RISC-V (riscv64)
+
 * Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 6:5.1.0-2
 - Drop use of %%buildarch in macros.octave (bugz#1733898)
Author	SHA1	Message	Date
David Abdurachmanov	661e8a0417	Merge remote-tracking branch 'up/f31' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2019-08-20 09:44:35 -07:00
David Abdurachmanov	39c85d7016	Add support for RISC-V (riscv64) Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-06-20 11:51:58 +02:00