Skip to content

Commit 9adea0a

Browse files
authored
Merge pull request #281 from h-vetinari/libflang
ignore libflang run-export for scipy-tests
2 parents 40d7f9e + df6bf0f commit 9adea0a

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

recipe/meta.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ source:
1616
# the submodules (not in tarball due to dear-github/dear-github#214)
1717
- url: https://github.com/scipy/scipy/archive/refs/tags/v{{ version }}.tar.gz
1818
sha256: ea1c8e3ebe88713063b70ff1b5902400b16131ad1f5b731b6585fb9f5721ed2d
19+
patches:
20+
# backport https://github.com/scipy/scipy/pull/21069
21+
- patches/0001-MAINT-fix-typo-in-small_dynamic_array.h-21069.patch
1922
# https://github.com/scipy/scipy/tree/v{{ version }}/scipy/_lib
2023
- git_url: https://github.com/data-apis/array-api-compat.git
2124
folder: scipy/_lib/array_api_compat
@@ -41,7 +44,7 @@ source:
4144
git_rev: a9ed9736ad52ff76ae1777922b700b13ca2bf0ae
4245

4346
build:
44-
number: 0
47+
number: 1
4548
skip: true # [py<310]
4649
# pypy is currently broken and on its way out anyway
4750
skip: true # [python_impl == "pypy"]
@@ -210,6 +213,9 @@ outputs:
210213
- name: scipy-tests
211214
script: build-output.sh # [not win]
212215
script: build-output.bat # [win]
216+
build:
217+
ignore_run_exports: # [win]
218+
- libflang # [win]
213219
requirements:
214220
build:
215221
- python # [build_platform != target_platform]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From 91c4074b0eb9e4f56e3c182e873f16bdbd83c11e Mon Sep 17 00:00:00 2001
2+
From: h-vetinari <[email protected]>
3+
Date: Sun, 30 Jun 2024 07:33:27 +1100
4+
Subject: [PATCH] MAINT: fix typo in small_dynamic_array.h (#21069)
5+
6+
on clang-19, this causes:
7+
```
8+
../scipy/_lib/_uarray/small_dynamic_array.h(145,18): error: reference to non-static member function must be called
9+
145 | size_ = copy.size;
10+
| ~~~~~^~~~
11+
1 error generated.
12+
```
13+
I'm not sure how previous versions (much less other compilers) dealt with this,
14+
as it seems that the `SmallDynamicArray` class has no `size` member or field at all.
15+
---
16+
scipy/_lib/_uarray/small_dynamic_array.h | 2 +-
17+
1 file changed, 1 insertion(+), 1 deletion(-)
18+
19+
diff --git a/scipy/_lib/_uarray/small_dynamic_array.h b/scipy/_lib/_uarray/small_dynamic_array.h
20+
index b6c46d7c44..351b5d8fc6 100644
21+
--- a/scipy/_lib/_uarray/small_dynamic_array.h
22+
+++ b/scipy/_lib/_uarray/small_dynamic_array.h
23+
@@ -142,7 +142,7 @@ public:
24+
25+
clear();
26+
27+
- size_ = copy.size;
28+
+ size_ = copy.size_;
29+
try {
30+
allocate();
31+
} catch (...) {

0 commit comments

Comments
 (0)