diff --git a/common/shlibs b/common/shlibs index 0814612ced3..965eef4df56 100644 --- a/common/shlibs +++ b/common/shlibs @@ -71,7 +71,6 @@ libppl.so.14 ppl-1.2_1 libppl_c.so.4 ppl-0.11_1 libstdc++.so.6 libstdc++-4.4.0_1 libssp.so.0 libssp-4.4.0_1 -libcxsparse.so.3 SuiteSparse-5.10.1_1 libncurses.so.6 ncurses-libs-6.0_1 ignore libncursesw.so.6 ncurses-libs-5.8_1 ignore libtinfo.so.6 ncurses-libtinfo-libs-6.2_2 @@ -4071,9 +4070,15 @@ libprimecount.so.7 primecount-7.2_1 libprimesieve.so.10 primesieve-8.0_1 libavif.so.15 libavif-0.11.0_1 libkdumpfile.so.10 libkdumpfile-0.4.1_1 -libamd.so.2 SuiteSparse-5.10.1_1 -libcholmod.so.3 SuiteSparse-5.10.1_1 -libumfpack.so.5 SuiteSparse-5.10.1_1 +libamd.so.3 SuiteSparse-6.0.1_1 +libcamd.so.3 SuiteSparse-6.0.1_1 +libccolamd.so.3 SuiteSparse-6.0.1_1 +libcholmod.so.4 SuiteSparse-6.0.1_1 +libcolamd.so.3 SuiteSparse-6.0.1_1 +libcxsparse.so.4 SuiteSparse-6.0.1_1 +libspqr.so.3 SuiteSparse-6.0.1_1 +libsuitesparseconfig.so.6 SuiteSparse-6.0.1_1 +libumfpack.so.6 SuiteSparse-6.0.1_1 libecl.so.21.2 ecl-21.2.1_1 libecm.so.1 ecm-7.0.4_3 libcliquer.so.1 cliquer-1.22_1 diff --git a/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch deleted file mode 100644 index 9ec775229ed..00000000000 --- a/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -This is to avoid running demos on `make install`, which break cross compile - ---- a/Makefile -+++ b/Makefile -@@ -294,7 +294,7 @@ endif - # just compile GraphBLAS - gb: - echo $(CMAKE_OPTIONS) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) -+ ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) - - # compile and install GraphBLAS libgraphblas_renamed, for MATLAB - gbrenamed: -@@ -309,7 +309,7 @@ gbrenamed: - - # just compile Mongoose - mon: -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) -+ ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) - - # compile and install Mongoose - moninstall: mon diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template index b304dfc8f78..869237dc9f8 100644 --- a/srcpkgs/SuiteSparse/template +++ b/srcpkgs/SuiteSparse/template @@ -1,44 +1,54 @@ # Template file for 'SuiteSparse' pkgname=SuiteSparse -version=5.12.0 +version=6.0.1 revision=1 -# XXX: re-enable TBB=-ltbb -DSPQR_CONFIG=-DHAVE_TBB when updating, if possible -make_build_args="BLAS=-lblas LAPACK=-llapack" -hostmakedepends="cmake chrpath" -makedepends="libgomp-devel lapack-devel mpfr-devel" +hostmakedepends="cmake gcc-fortran" +makedepends="libgomp-devel mpfr-devel + $(vopt_if openblas 'openblas-devel' 'lapack-devel')" short_desc="Suite of sparse matrix software" maintainer="Gonzalo TornarĂ­a " license="custom:multiple" homepage="https://people.engr.tamu.edu/davis/suitesparse.html" changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog" distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz" -checksum=5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de +checksum=06f55a0449775d1f43d8a33ba8c8417ea8cf76c27833b465c49825baa8741d0c + +build_options="openblas" + +case "$XBPS_TARGET_MACHINE" in + x86_64*|i686*|aarch64*|armv[67]*|ppc64*) + # Prefer accelerated routines where available + build_options_default="openblas" + ;; + *) ;; +esac do_build() { - make config library $make_build_args JOBS=$XBPS_MAKEJOBS + make library \ + JOBS=$XBPS_MAKEJOBS \ + CMAKE_OPTIONS="-DBLA_VENDOR=$(vopt_if openblas 'OpenBLAS' 'Generic') \ + -DCMAKE_INSTALL_PREFIX=$DESTDIR/usr" } do_check() { - make go $make_build_args LD_LIBRARY_PATH=$wrksrc/lib JOBS=$XBPS_MAKEJOBS + make demos \ + JOBS=$XBPS_MAKEJOBS } do_install() { - make install $make_build_args INSTALL=$DESTDIR/usr + make install vlicense LICENSE.txt - - # remove invalid rpath - chrpath -d $DESTDIR/usr/lib/lib*.so } SuiteSparse-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" + # conflict for /usr/lib/libmongoose.{a,so} + conflicts="mongoose-devel" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove "usr/lib/*.a" - # do not vmove libmetis.so - vmove "usr/lib/lib[a-ln-z]*.so" - vmove "usr/lib/libmo*.so" - vmove usr/share/doc + vmove "usr/lib/*.so" } }