From e67788dbb613acfe0d786d90d92a02ecbb9bf3f9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 19 Jul 2021 11:06:37 -0400 Subject: [PATCH] openblas: update to 0.3.17, adopt --- .../openblas/patches/ppc-dynamic-gcc9.patch | 25 ------------------- srcpkgs/openblas/template | 17 ++++++------- 2 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch diff --git a/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch b/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch deleted file mode 100644 index 92dcb7f7387..00000000000 --- a/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7a3c188fb1bf669aa4cf571e1e6fbcd1692f4f7a Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 3 Jan 2021 13:16:16 +0100 -Subject: [PATCH] fix build on gcc9 - ---- - driver/others/dynamic_power.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git driver/others/dynamic_power.c driver/others/dynamic_power.c -index a2f56d8..e79e7e9 100644 ---- a/driver/others/dynamic_power.c -+++ b/driver/others/dynamic_power.c -@@ -53,7 +53,7 @@ static gotoblas_t *get_coretype(void) { - return &gotoblas_POWER10; - #endif - /* Fall back to the POWER9 implementation if the toolchain is too old or the MMA feature is not set */ --#if (!defined __GNUC__) || ( __GNUC__ >= 6) -+#if (!defined __GNUC__) || ( __GNUC__ >= 10) - if (__builtin_cpu_is("power10")) - return &gotoblas_POWER9; - #endif --- -2.30.0 - diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template index 58a75941be4..a6ef0fe0ef9 100644 --- a/srcpkgs/openblas/template +++ b/srcpkgs/openblas/template @@ -1,19 +1,20 @@ # Template file for 'openblas' pkgname=openblas -version=0.3.13 -revision=3 +version=0.3.17 +revision=1 wrksrc="OpenBLAS-${version}" build_style=gnu-makefile -make_build_args=" HOSTCC=gcc USE_OPENMP=1" +make_build_args="HOSTCC=gcc USE_OPENMP=1" +make_install_args="OPENBLAS_INCLUDE_DIR=\$(PREFIX)/include/openblas" hostmakedepends="perl gcc-fortran" makedepends="libgomp-devel" -short_desc="Basic Linear Algebra Subprograms based on GotoBLAS2" -maintainer="Julien Dehos " +short_desc="Optimized BLAS (Basic Linear Algebra Subprograms) based on GotoBLAS2" +maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://www.openblas.net/" changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt" distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz" -checksum=79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e +checksum=df2934fa33d04fd84d839ca698280df55c690c86a5a1133b3f7266fce1de279f case "${XBPS_TARGET_MACHINE}" in armv5*) make_build_args+=" TARGET=ARMV5" ;; @@ -29,10 +30,6 @@ case "${XBPS_TARGET_MACHINE}" in *) broken="Add your CPU" ;; esac -post_extract() { - vsed -i 's#OPENBLAS_INCLUDE_DIR := .*$#OPENBLAS_INCLUDE_DIR := $(PREFIX)/include/openblas#' Makefile.install -} - post_install() { vlicense LICENSE }