[PR PATCH] flintlib: update to 2.8.5.

[PR PATCH] flintlib: update to 2.8.5.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages flintlib
https://github.com/void-linux/void-packages/pull/36945

flintlib: update to 2.8.5.
Also, enable openblas (used for matrix multiplication)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

I ran sagemath long doctest suite with this. The update by itself is just a bugfix release, but I also took the chance to enable openblas for matrix multiplication so I wanted to make sure I didn't mess up (I had it disabled b/c of a misunderstanding on my part, it seems convenient to have it enabled.)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-flintlib-36945.patch --]
[-- Type: text/x-diff, Size: 1899 bytes --]

From 525659c12ecace1fc72b2abc13dcfe894e6d39ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 28 Apr 2022 11:24:39 -0300
Subject: [PATCH] flintlib: update to 2.8.5.

Also, enable openblas (used for matrix multiplication)
---
 srcpkgs/flintlib/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index cebf8e300812..32656aebc4a3 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,27 +1,31 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.4
+version=2.8.5
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
-configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr $(vopt_if ntl --with-ntl=/usr)"
-makedepends="mpfr-devel $(vopt_if ntl ntl-devel)"
+configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr
+ $(vopt_if openblas --with-blas=/usr) $(vopt_if ntl --with-ntl=/usr)"
+makedepends="mpfr-devel $(vopt_if openblas openblas-devel)
+ $(vopt_if ntl ntl-devel)"
 short_desc="Fast Library for Number Theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=61df92ea8c8e9dc692d46c71d7f50aaa09a33d4ba08d02a1784730a445e5e4be
+checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8
 
-build_options="ntl"
+build_options="openblas ntl"
 desc_option_ntl="enable NTL support"
+build_options_default="openblas"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" ntl"
 fi
 
 CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
+export EXTRA_INC_DIRS="/usr/include/openblas"
 
 flintlib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} mpfr-devel"

Re: flintlib: update to 2.8.5.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/36945#issuecomment-1114363619

Comment:
Cross compilation fails with
```
mul_blas.c:24:10: fatal error: cblas.h: No such file or directory
   24 | #include "cblas.h"
      |          ^~~~~~~~~
```
This file is in `/usr/include/openblas/cblas.h`.

I added `export EXTRA_INC_DIRS="/usr/include/openblas"` to the template to fix this in normal build, but it seems to be ignored by cross builds... Any ideas?

Maybe I should just add `-I/usr/include/openblas` to `CFLAGS`?

Re: [PR PATCH] [Updated] flintlib: update to 2.8.5.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages flintlib
https://github.com/void-linux/void-packages/pull/36945

flintlib: update to 2.8.5.
Also, enable openblas (used for matrix multiplication)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

I ran sagemath long doctest suite with this. The update by itself is just a bugfix release, but I also took the chance to enable openblas for matrix multiplication so I wanted to make sure I didn't mess up (I had it disabled b/c of a misunderstanding on my part, it seems convenient to have it enabled.)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-flintlib-36945.patch --]
[-- Type: text/x-diff, Size: 1696 bytes --]

From baa5aead357307ffff6451960f826e00f19ce466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 28 Apr 2022 11:24:39 -0300
Subject: [PATCH] flintlib: update to 2.8.5.

Also, enable openblas (used for matrix multiplication)
---
 srcpkgs/flintlib/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index cebf8e300812..57a4a2de4f42 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,21 +1,24 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.4
+version=2.8.5
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
-configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr $(vopt_if ntl --with-ntl=/usr)"
-makedepends="mpfr-devel $(vopt_if ntl ntl-devel)"
+configure_args="--prefix=/usr $(vopt_with ntl)
+ $(vopt_if openblas --with-blas=${XBPS_CROSS_BASE}/usr/include/openblas)"
+makedepends="mpfr-devel $(vopt_if ntl ntl-devel)
+ $(vopt_if openblas openblas-devel)"
 short_desc="Fast Library for Number Theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=61df92ea8c8e9dc692d46c71d7f50aaa09a33d4ba08d02a1784730a445e5e4be
+checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8
 
-build_options="ntl"
+build_options="ntl openblas"
 desc_option_ntl="enable NTL support"
+build_options_default="openblas"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" ntl"

Re: flintlib: update to 2.8.5.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/36945#issuecomment-1114383815

Comment:
:facepalm: of course the answer is to use `${XBPS_CROSS_BASE}/usr/include/openblas` instead, which will work on both cases.

I also simplified the template a little bit and avoid all the warnings from wrong `-I/usr/include` and `-L/usr/lib`.

Re: [PR PATCH] [Merged]: flintlib: update to 2.8.5.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]

There's a merged pull request on the void-packages repository

flintlib: update to 2.8.5.
https://github.com/void-linux/void-packages/pull/36945

Description:
Also, enable openblas (used for matrix multiplication)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

I ran sagemath long doctest suite with this. The update by itself is just a bugfix release, but I also took the chance to enable openblas for matrix multiplication so I wanted to make sure I didn't mess up (I had it disabled b/c of a misunderstanding on my part, it seems convenient to have it enabled.)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->