Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
61b2f46ac0 | ||
|
2621de214a | ||
|
c3b96d5a03 | ||
|
a67f79d80a | ||
|
e1cf3afa97 | ||
|
0f98426a15 | ||
|
f82faf5f58 | ||
|
f89a01037a | ||
|
4161884180 | ||
|
be55d20164 | ||
|
b1d97f35c3 | ||
|
733302f86a | ||
|
104f111ea2 | ||
|
e6e1baf1c0 | ||
|
2c1fd845b6 | ||
|
fe99995595 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -32,3 +32,5 @@ octave-3.2.4.tar.bz2
|
||||
/octave-4.4.1-docs.tar.gz
|
||||
/octave-5.1.0.tar.lz
|
||||
/octave-5.1.0-docs.tar.lz
|
||||
/octave-5.2.0.tar.lz
|
||||
/octave-5.2.0-docs.tar.lz
|
||||
|
@ -1,28 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Mike Miller <mtmiller@octave.org>
|
||||
# Date 1554238576 25200
|
||||
# Node ID c3716220d5b93c49e1c7cc8ebe0b76dd961f4ec7
|
||||
# Parent fc73dafece570f201c18a4eb4a8729a654cfcfbb
|
||||
fix pause and kbhit with glibc 2.28 end-of-file state behavior (bug #55029)
|
||||
|
||||
* sysdep.cc (octave::kbhit): Call "clearerr (stdin)" on end-of-file condition
|
||||
in addition to "std::cin.clear ()". In glibc 2.28, end-of-file is persistent
|
||||
and must be cleared by the application.
|
||||
|
||||
diff --git a/libinterp/corefcn/sysdep.cc b/libinterp/corefcn/sysdep.cc
|
||||
--- a/libinterp/corefcn/sysdep.cc
|
||||
+++ b/libinterp/corefcn/sysdep.cc
|
||||
@@ -566,7 +566,10 @@
|
||||
int c = std::cin.get ();
|
||||
|
||||
if (std::cin.fail () || std::cin.eof ())
|
||||
- std::cin.clear ();
|
||||
+ {
|
||||
+ std::cin.clear ();
|
||||
+ clearerr (stdin);
|
||||
+ }
|
||||
|
||||
// Restore it, enabling system call restarts (if possible).
|
||||
octave::set_interrupt_handler (saved_interrupt_handler, true);
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -up octave-5.0.91/configure.ac.sundials3 octave-5.0.91/configure.ac
|
||||
--- octave-5.0.91/configure.ac.sundials3 2019-02-04 10:50:20.000000000 -0700
|
||||
+++ octave-5.0.91/configure.ac 2019-02-05 22:05:44.096260529 -0700
|
||||
diff -up octave-5.1.90/configure.ac.sundials3 octave-5.1.90/configure.ac
|
||||
--- octave-5.1.90/configure.ac.sundials3 2020-01-18 11:48:59.000074162 -0700
|
||||
+++ octave-5.1.90/configure.ac 2020-01-18 11:50:21.861966968 -0700
|
||||
@@ -2220,15 +2220,15 @@ OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS
|
||||
[], [don't use SUNDIALS IDA library, solvers ode15i and ode15s will be disabled],
|
||||
[warn_sundials_ida=
|
||||
@ -19,10 +19,10 @@ diff -up octave-5.0.91/configure.ac.sundials3 octave-5.0.91/configure.ac
|
||||
+ && test $octave_cv_sundials_sunlinsol_dense = yes \
|
||||
&& test $octave_cv_sundials_realtype_is_double = yes; then
|
||||
AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.])
|
||||
fi
|
||||
diff -up octave-5.0.91/libinterp/dldfcn/__ode15__.cc.sundials3 octave-5.0.91/libinterp/dldfcn/__ode15__.cc
|
||||
--- octave-5.0.91/libinterp/dldfcn/__ode15__.cc.sundials3 2019-02-04 10:50:20.000000000 -0700
|
||||
+++ octave-5.0.91/libinterp/dldfcn/__ode15__.cc 2019-02-05 22:06:48.074012827 -0700
|
||||
|
||||
diff -up octave-5.1.90/libinterp/dldfcn/__ode15__.cc.sundials3 octave-5.1.90/libinterp/dldfcn/__ode15__.cc
|
||||
--- octave-5.1.90/libinterp/dldfcn/__ode15__.cc.sundials3 2019-12-21 17:01:27.000000000 -0700
|
||||
+++ octave-5.1.90/libinterp/dldfcn/__ode15__.cc 2020-01-18 11:48:59.002074159 -0700
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
|
||||
@ -312,10 +312,10 @@ diff -up octave-5.0.91/libinterp/dldfcn/__ode15__.cc.sundials3 octave-5.0.91/lib
|
||||
|
||||
// Integrate
|
||||
retval = dae.integrate (numt, tspan, y0, yp0, refine,
|
||||
diff -up octave-5.0.91/m4/acinclude.m4.sundials3 octave-5.0.91/m4/acinclude.m4
|
||||
--- octave-5.0.91/m4/acinclude.m4.sundials3 2019-02-04 10:50:20.000000000 -0700
|
||||
+++ octave-5.0.91/m4/acinclude.m4 2019-02-05 22:05:44.100260576 -0700
|
||||
@@ -2210,14 +2210,11 @@ dnl Check whether SUNDIALS IDA library i
|
||||
diff -up octave-5.1.90/m4/acinclude.m4.sundials3 octave-5.1.90/m4/acinclude.m4
|
||||
--- octave-5.1.90/m4/acinclude.m4.sundials3 2019-12-21 17:01:27.000000000 -0700
|
||||
+++ octave-5.1.90/m4/acinclude.m4 2020-01-18 11:48:59.005074156 -0700
|
||||
@@ -2215,14 +2215,11 @@ dnl Check whether SUNDIALS IDA library i
|
||||
dnl precision realtype.
|
||||
dnl
|
||||
AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE], [
|
||||
@ -330,7 +330,7 @@ diff -up octave-5.0.91/m4/acinclude.m4.sundials3 octave-5.0.91/m4/acinclude.m4
|
||||
#endif
|
||||
#include <assert.h>
|
||||
]], [[
|
||||
@@ -2233,61 +2230,72 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_R
|
||||
@@ -2238,61 +2235,72 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_R
|
||||
fi
|
||||
])
|
||||
dnl
|
||||
@ -436,9 +436,9 @@ diff -up octave-5.0.91/m4/acinclude.m4.sundials3 octave-5.0.91/m4/acinclude.m4
|
||||
fi
|
||||
])
|
||||
dnl
|
||||
diff -up octave-5.0.91/scripts/ode/ode15i.m.sundials3 octave-5.0.91/scripts/ode/ode15i.m
|
||||
--- octave-5.0.91/scripts/ode/ode15i.m.sundials3 2019-02-04 10:50:20.000000000 -0700
|
||||
+++ octave-5.0.91/scripts/ode/ode15i.m 2019-02-05 22:05:44.101260588 -0700
|
||||
diff -up octave-5.1.90/scripts/ode/ode15i.m.sundials3 octave-5.1.90/scripts/ode/ode15i.m
|
||||
--- octave-5.1.90/scripts/ode/ode15i.m.sundials3 2019-12-21 17:01:27.000000000 -0700
|
||||
+++ octave-5.1.90/scripts/ode/ode15i.m 2020-01-18 11:48:59.006074155 -0700
|
||||
@@ -452,7 +452,7 @@ endfunction
|
||||
%! assert ([t(end), y(end,:)], fref, 1e-3);
|
||||
|
||||
@ -457,9 +457,9 @@ diff -up octave-5.0.91/scripts/ode/ode15i.m.sundials3 octave-5.0.91/scripts/ode/
|
||||
%! DFDY = sparse ([-0.04, 1;
|
||||
%! 0.04, 1]);
|
||||
%! DFDYP = sparse ([-1, 0, 0;
|
||||
diff -up octave-5.0.91/scripts/ode/ode15s.m.sundials3 octave-5.0.91/scripts/ode/ode15s.m
|
||||
--- octave-5.0.91/scripts/ode/ode15s.m.sundials3 2019-02-04 10:50:20.000000000 -0700
|
||||
+++ octave-5.0.91/scripts/ode/ode15s.m 2019-02-05 22:05:44.102260599 -0700
|
||||
diff -up octave-5.1.90/scripts/ode/ode15s.m.sundials3 octave-5.1.90/scripts/ode/ode15s.m
|
||||
--- octave-5.1.90/scripts/ode/ode15s.m.sundials3 2019-12-21 17:01:27.000000000 -0700
|
||||
+++ octave-5.1.90/scripts/ode/ode15s.m 2020-01-18 11:48:59.007074154 -0700
|
||||
@@ -545,21 +545,21 @@ endfunction
|
||||
%! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt);
|
||||
%! assert ([t(end), y(end,:)], frefrob, 1e-3);
|
||||
|
92
octave.spec
92
octave.spec
@ -5,13 +5,25 @@
|
||||
|
||||
%global builddocs 1
|
||||
|
||||
# Use Qt5 on F26+
|
||||
%if 0%{?fedora}
|
||||
# Use Qt5 on Fedora and EL8+
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%bcond_without qt5
|
||||
%else
|
||||
%bcond_with qt5
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 33
|
||||
%bcond_without flexiblas
|
||||
%endif
|
||||
%if %{with flexiblas}
|
||||
%global blaslib flexiblas
|
||||
%else
|
||||
%global blaslib openblas
|
||||
%endif
|
||||
|
||||
# Compile with ILP64 BLAS - not yet working
|
||||
%bcond_with blas64
|
||||
|
||||
# For rc versions, change release manually
|
||||
#global rcver 2
|
||||
%if 0%{?rcver:1}
|
||||
@ -19,10 +31,13 @@
|
||||
%global relsuf .rc%{?rcver}
|
||||
%endif
|
||||
|
||||
%global optflags %{optflags}
|
||||
%global build_ldflags %{build_ldflags} -flto
|
||||
|
||||
Name: octave
|
||||
Epoch: 6
|
||||
Version: 5.1.0
|
||||
Release: 2%{?rcver:.rc%{rcver}}%{?dist}
|
||||
Version: 5.2.0
|
||||
Release: 7%{?dist}
|
||||
Summary: A high-level language for numerical computations
|
||||
License: GPLv3+
|
||||
URL: http://www.octave.org
|
||||
@ -33,14 +48,10 @@ Source0: https://ftp.gnu.org/gnu/octave/octave-%{version}.tar.lz
|
||||
Source1: macros.octave
|
||||
Source2: xorg.conf
|
||||
# Prebuilt docs from Fedora for EPEL
|
||||
Source3: octave-5.1.0-docs.tar.lz
|
||||
Source3: octave-5.2.0-docs.tar.lz
|
||||
# SUNDIALS 3 support
|
||||
# https://savannah.gnu.org/bugs/?52475
|
||||
Patch1: octave-sundials3.patch
|
||||
# Proper EOF handling
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1705129
|
||||
# https://hg.savannah.gnu.org/hgweb/octave/rev/c3716220d5b9
|
||||
Patch2: octave-eof.patch
|
||||
|
||||
Provides: octave(api) = %{octave_api}
|
||||
Provides: bundled(gnulib)
|
||||
@ -73,7 +84,7 @@ BuildRequires: libappstream-glib
|
||||
%endif
|
||||
|
||||
BuildRequires: arpack-devel
|
||||
BuildRequires: openblas-devel
|
||||
BuildRequires: %{blaslib}-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: curl-devel
|
||||
@ -114,7 +125,11 @@ BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: qscintilla-devel
|
||||
%endif
|
||||
BuildRequires: readline-devel
|
||||
%if %{with blas64}
|
||||
BuildRequires: suitesparse64-devel
|
||||
%else
|
||||
BuildRequires: suitesparse-devel
|
||||
%endif
|
||||
BuildRequires: sundials-devel
|
||||
BuildRequires: tex(dvips)
|
||||
BuildRequires: texinfo
|
||||
@ -129,7 +144,6 @@ BuildRequires: texlive-metapost
|
||||
BuildRequires: zlib-devel
|
||||
# For check
|
||||
BuildRequires: mesa-dri-drivers
|
||||
BuildRequires: xorg-x11-apps
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: xorg-x11-drv-dummy
|
||||
%endif
|
||||
@ -184,7 +198,7 @@ Requires: gcc-c++
|
||||
Requires: gcc-gfortran
|
||||
Requires: fftw-devel%{?_isa}
|
||||
Requires: hdf5-devel%{?_isa}
|
||||
Requires: openblas-devel%{?_isa}
|
||||
Requires: %{blaslib}-devel%{?_isa}
|
||||
Requires: readline-devel%{?_isa}
|
||||
Requires: zlib-devel
|
||||
Requires: libappstream-glib
|
||||
@ -203,7 +217,9 @@ This package contains documentation for Octave.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?rctag}
|
||||
%patch2 -p1 -b .eof
|
||||
%if %{with blas64}
|
||||
sed -i -e 's/OCTAVE_CHECK_LIB(suitesparseconfig,/OCTAVE_CHECK_LIB(suitesparseconfig64,/' configure.ac
|
||||
%endif
|
||||
# EPEL7's autoconf/automake is too old so don't do
|
||||
# unneeded patches there
|
||||
%if 0%{?fedora}
|
||||
@ -213,7 +229,9 @@ autoreconf -i
|
||||
|
||||
|
||||
%build
|
||||
%global enable64 no
|
||||
export AR=%{_bindir}/gcc-ar
|
||||
export RANLIB=%{_bindir}/gcc-ranlib
|
||||
export NM=%{_bindir}/gcc-nm
|
||||
export F77=gfortran
|
||||
# TODO: some items appear to be bundled in libcruft..
|
||||
# gl2ps.c is bundled. Anything else?
|
||||
@ -230,10 +248,19 @@ export CPPFLAGS=-I%{_includedir}/suitesparse
|
||||
# Disable _GLIBCXX_ASSERTIONS for now
|
||||
# https://savannah.gnu.org/bugs/?55547
|
||||
export CXXFLAGS="$(echo %optflags | sed s/-Wp,-D_GLIBCXX_ASSERTIONS//)"
|
||||
%configure --enable-shared --disable-static --enable-64=%enable64 \
|
||||
|
||||
verstr=$(%{__cxx} --version | head -1)
|
||||
if [[ "$verstr" == *"GCC"* ]]; then
|
||||
CXXFLAGS="$CXXFLAGS -flto=auto"
|
||||
else
|
||||
CXXFLAGS="$CXXFLAGS -flto"
|
||||
fi
|
||||
|
||||
%configure --enable-shared --disable-static \
|
||||
--enable-float-truncate \
|
||||
%{?disabledocs} \
|
||||
--disable-silent-rules \
|
||||
--with-blas=%{blaslib}%{?with_blas64:64} \
|
||||
--with-java-includedir=/usr/lib/jvm/java/include \
|
||||
--with-java-libdir=$libjvm \
|
||||
--with-qrupdate \
|
||||
@ -361,12 +388,14 @@ fi
|
||||
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf :99 &
|
||||
sleep 2
|
||||
export DISPLAY=:99
|
||||
export FLEXIBLAS=netlib
|
||||
make check %{?el7:|| :}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%dir %{_pkgdocdir}
|
||||
%{_pkgdocdir}/AUTHORS
|
||||
%{_pkgdocdir}/BUGS
|
||||
%{_pkgdocdir}/ChangeLog
|
||||
@ -410,6 +439,39 @@ make check %{?el7:|| :}
|
||||
%{_pkgdocdir}/refcard*.pdf
|
||||
|
||||
%changelog
|
||||
* Thu Aug 13 2020 Iñaki Úcar <iucar@fedoraproject.org> - 5.2.0-7
|
||||
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||
|
||||
* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 5.2.0-6
|
||||
- Drop unnecessary (apparently unused) BuildRequires: xorg-x11-apps
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6:5.2.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 6:5.2.0-4
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 6:5.2.0-3
|
||||
- Rebuild for hdf5 1.10.6
|
||||
|
||||
* Mon Apr 13 2020 Orion Poplawski <orion@nwra.com> - 6:5.2.0-2
|
||||
- Rebuild for sundials 5.2.0
|
||||
|
||||
* Mon Feb 03 2020 Orion Poplawski <orion@nwra.com> - 6:5.2.0-1
|
||||
- Update to 5.2.0
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6:5.1.0-4.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Nov 2 2019 Orion Poplawski <orion@nwra.com> - 6:5.1.0-4
|
||||
- Enable 64-bit array indexes
|
||||
|
||||
* Sat Nov 2 2019 Orion Poplawski <orion@nwra.com> - 6:5.1.0-3
|
||||
- Enable LTO optimisations
|
||||
|
||||
* Mon Oct 14 2019 Orion Poplawski <orion@nwra.com> - 6:5.1.0-2.1
|
||||
- Rebuild for suitesparse 5.4.0
|
||||
|
||||
* Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 6:5.1.0-2
|
||||
- Drop use of %%buildarch in macros.octave (bugz#1733898)
|
||||
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (octave-5.1.0.tar.lz) = 34facc20ffceaead05e62e16cc70bd603919c7e52c7489faa17b5c969a160c655f50c4aeb41ecee2e2d0a6245cc3364cf9009ddd3cecb17b9e06bbdacaa0a516
|
||||
SHA512 (octave-5.1.0-docs.tar.lz) = 6bf24ed95d5d2957271abb8902a156edc588962b95218b05936858fafe8205f4295f072388f7331ad5700946fbae701bd0c3f2a59c258f390ea92c85eb87fdd2
|
||||
SHA512 (octave-5.2.0.tar.lz) = e8f64c5703548e3f209aeaae51c3f6907db5189ec7790600be6f335d9edeb183d9dcfbf5ec711c5e30aa953877dd176a1c506ae90c505a52ed74dba6ce69c7f5
|
||||
SHA512 (octave-5.2.0-docs.tar.lz) = 6b1bf45446c7717153901ca0f39406c1b7dab6016012c51ccdce2f102f5ffae69262d3578a63adbc426910c31bbb7cee11221e5e224bb813630d829ed21b9ab6
|
||||
|
Loading…
Reference in New Issue
Block a user