Skip to content

Commit

Permalink
backport patch for fixing linux builds
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Jul 22, 2024
1 parent d0d4bfd commit beba7e8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 8 deletions.
5 changes: 3 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ source:
patches:
# Test BLAS and LAPACKE in addition to LAPACK
- patches/0001-Test-BLAS-and-LAPACKE-in-addition-to-LAPACK.patch
# Only the test-suite is compiled here, and we therefore do not need to
# carry all the patches that the lapack-feedstock has (see comment below)
# backport https://github.com/Reference-LAPACK/lapack/pull/391
# to fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114304
- patches/0002-remove-extraneous-semicolon.patch

- url: https://github.com/isuruf/vecLibFort/archive/99af8640e98c829b41c3235e3706760cd5696fe4.tar.gz
sha256: 80de7c6e83d1d84d016b4cb299f2c15f5a82b9d36865dd5c16bf221fe9a303ad
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From edbf3225c76685d753715d1f0055e56c89dda2d1 Mon Sep 17 00:00:00 2001
From 48c2ace8dcd69883470c67562d0e0b36ee1ddd90 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Mon, 7 Jan 2019 00:23:59 -0600
Subject: [PATCH] Test BLAS and LAPACKE in addition to LAPACK
Subject: [PATCH 1/2] Test BLAS and LAPACKE in addition to LAPACK

---
CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9dbf974..dabab4c0 100644
index d9dbf9746..dabab4c02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,6 +295,8 @@ endif()
Expand All @@ -20,6 +20,3 @@ index d9dbf974..dabab4c0 100644
endif()

# --------------------------------------------------
--
2.26.2.windows.1

22 changes: 22 additions & 0 deletions recipe/patches/0002-remove-extraneous-semicolon.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 024de713931ec886eacf032e64dd205b79588ad7 Mon Sep 17 00:00:00 2001
From: Iain Hibbert <plunky@netbsd.org>
Date: Sun, 23 Feb 2020 21:39:25 +0000
Subject: [PATCH 2/2] remove extraneous semicolon

this semicolon causes a test to fail with read error, using g95
---
TESTING/dbal.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TESTING/dbal.in b/TESTING/dbal.in
index c00fe3e83..828629b15 100644
--- a/TESTING/dbal.in
+++ b/TESTING/dbal.in
@@ -209,6 +209,6 @@ DBL: Tests DGEBAL
0.00000000000000000000D+00 0.00000000000000000000D+00 0.00000000000000000000D+00 0.63043209914231165391D-03 0.10000000000000000000D+01 0.79310682416114036641D+03
0.00000000000000000000D+00 0.00000000000000000000D+00 0.00000000000000000000D+00 0.00000000000000000000D+00 0.12608641982846233078D-02 0.10000000000000000000D+01

- 2.494800386918399765D+291 1.582914569427869018D+175 1.004336277661868922D+59 3.186183822264904554D-58 5.053968264940243633D-175 0.40083367200179455560D-291;
+ 2.494800386918399765D+291 1.582914569427869018D+175 1.004336277661868922D+59 3.186183822264904554D-58 5.053968264940243633D-175 0.40083367200179455560D-291

0

0 comments on commit beba7e8

Please sign in to comment.