rpms/octave
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a generic location for libjvm.so, require java-headless (bug #1190523)

Browse Source
This commit is contained in:
Orion Poplawski 2015-02-08 19:35:24 -07:00
parent dc21003374
commit 087e8477a8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octave.spec
View File

@ -16,7 +16,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 3.8.2 Version: 3.8.2
Release: 8%{?dist} Release: 9%{?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+
@ -76,6 +76,7 @@ BuildRequires: zlib-devel
Requires: epstool gnuplot gnuplot-common less info texinfo Requires: epstool gnuplot gnuplot-common less info texinfo
Requires: hdf5 = %{_hdf5_version} Requires: hdf5 = %{_hdf5_version}
Requires: java-headless
Requires(post): info Requires(post): info
Requires(preun): info Requires(preun): info
@ -139,11 +140,15 @@ export F77=gfortran
%if !%{builddocs} %if !%{builddocs}
%global disabledocs --disable-docs %global disabledocs --disable-docs
%endif %endif
# Find libjvm.so for this architecture in generic location
libjvm=$(find /usr/lib/jvm/jre/lib -name libjvm.so -printf %h)
export JAVA_HOME=%{java_home}
# JIT support is still experimental, and causes a segfault on ARM. # 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 \
%{?disabledocs} \ %{?disabledocs} \
--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-java-libdir=$libjvm \
--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 \
@ -314,6 +319,9 @@ fi
%changelog %changelog
* Sun Feb 08 2015 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.2-9
- Use a generic location for libjvm.so, require java-headless (bug #1190523)
* Wed Jan 07 2015 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.2-8 * Wed Jan 07 2015 Orion Poplawski <orion@cora.nwra.com> - 6:3.8.2-8
- Rebuild for hdf5 1.8.14 - Rebuild for hdf5 1.8.14