Update to 3.8.0-rc2. Disable JIT as it segfaults on ARM.

This commit is contained in:
Susi Lehtola 2013-12-24 01:22:16 +02:00
parent b3bb96f3e8
commit 3f64382f50
3 changed files with 10 additions and 4 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ octave-3.2.4.tar.bz2
/octave-3.6.4-rc2.tar.gz /octave-3.6.4-rc2.tar.gz
/octave-3.6.4.tar.bz2 /octave-3.6.4.tar.bz2
/octave-3.8.0-rc1.tar.gz /octave-3.8.0-rc1.tar.gz
/octave-3.8.0-rc2.tar.gz

View File

@ -2,7 +2,7 @@
%global octave_api api-v49+ %global octave_api api-v49+
# For rc versions, change release manually # For rc versions, change release manually
%global rcver 1 %global rcver 2
%if 0%{?rcver:1} %if 0%{?rcver:1}
%global rctag -rc%{?rcver} %global rctag -rc%{?rcver}
%endif %endif
@ -10,7 +10,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 3.8.0 Version: 3.8.0
Release: 0.1.rc1%{?dist} Release: 0.2.rc2%{?dist}
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
Group: Applications/Engineering Group: Applications/Engineering
License: GPLv3+ License: GPLv3+
@ -125,12 +125,14 @@ export F77=gfortran
%global atlasblaslib -lf77blas -latlas %global atlasblaslib -lf77blas -latlas
%global atlaslapacklib -llapack %global atlaslapacklib -llapack
%endif %endif
# JIT support is still experimental, and causes a segfault on ARM.
%configure --enable-shared --disable-static --enable-64=%enable64 \ %configure --enable-shared --disable-static --enable-64=%enable64 \
--with-blas="-L%{_libdir}/atlas %{atlasblaslib}" \ --with-blas="-L%{_libdir}/atlas %{atlasblaslib}" \
--with-lapack="-L%{_libdir}/atlas %{atlaslapacklib}" \ --with-lapack="-L%{_libdir}/atlas %{atlaslapacklib}" \
--with-qrupdate \ --with-qrupdate \
--with-amd --with-umfpack --with-colamd --with-ccolamd --with-cholmod \ --with-amd --with-umfpack --with-colamd --with-ccolamd --with-cholmod \
--with-cxsparse --with-cxsparse \
--disable-jit
# Check that octave_api is set correctly (autogenerated file) # Check that octave_api is set correctly (autogenerated file)
make -C libinterp version.h make -C libinterp version.h
@ -284,6 +286,9 @@ fi
%changelog %changelog
* Sat Dec 21 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 6:3.8.0-0.2.rc2
- Update to 3.8.0-rc2.
* Fri Dec 6 2013 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-0.1.rc1 * Fri Dec 6 2013 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.0-0.1.rc1
- Update to 3.8.0-rc1 - Update to 3.8.0-rc1
- Drop patches - Drop patches

View File

@ -1 +1 @@
8d538221e7ded5a67e5f6462aaf5321b octave-3.8.0-rc1.tar.gz 2198cea81c0b56b1571743e7d5f6b83a octave-3.8.0-rc2.tar.gz