From 08c0c2989840892f18ed621c0a4616b4d7a98895 Mon Sep 17 00:00:00 2001 From: Olaf Mersmann Date: Tue, 5 Jan 2021 00:16:17 +0100 Subject: [PATCH] octave: update to 6.3.0. - add support for targets without proper openblas support --- srcpkgs/octave/template | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 8a92ed68d532..a5187b4cb789 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,19 +1,33 @@ # Template file for 'octave' pkgname=octave -version=5.2.0 -revision=2 +version=6.3.0 +revision=1 build_style=gnu-configure -configure_args=" --with-blas=openblas --with-lapack=openblas" -hostmakedepends="perl gcc-fortran pkg-config gnuplot" -makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel - lcms2-devel glpk-devel" +hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar" +makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel + glpk-devel" depends="$(vopt_if gui qt5-plugin-sqlite) texinfo" +checkdepends="texlive-dvi tar zip unzip" short_desc="High-level language, primarily intended for numerical computations" maintainer="Diogo Leal " license="GPL-3.0-or-later" homepage="https://gnu.org/software/octave/" +changelog="https://www.gnu.org/software/octave/NEWS-6.1.html" distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz" -checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1 +checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e + +# Use OpenBLAS on platforms where it is available and fallback to regular BLAS +# on all others. +case "$XBPS_TARGET_MACHINE" in + # List of supported architectures copied from openblas. + armv[67]*|aarch64*|i686*|x86_64*|ppc64*) + makedepends+=" openblas-devel" + configure_args=" --with-blas=openblas --with-lapack=openblas" + ;; + *) + makedepends+=" blas-devel lapack-devel" + ;; +esac # Package build options # TODO: some options are still missing, such as @@ -65,7 +79,7 @@ makedepends+=" $(vopt_if curl libcurl-devel) $(vopt_if fftw3 fftw-devel) $(vopt_if graphicsmagick libgraphicsmagick-devel) - $(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel') + $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel') $(vopt_if hdf5 hdf5-devel) $(vopt_if imagemagick libmagick-devel) $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")