Skip to content

Commit 2d438f5

Browse files
committed
Correct patches for v0.3.31
1 parent 7ef951e commit 2d438f5

9 files changed

+226
-131
lines changed

recipes/recipes_emscripten/openblas-flang/patches/0001-Remove-march-flags.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3ccdc39cfc3be211cf926cf78a748a8879416a93 Mon Sep 17 00:00:00 2001
1+
From 33f7828727f374c6299126aa8abff4606b1c2efe Mon Sep 17 00:00:00 2001
22
From: Isabel Paredes <isabel.paredes@quantstack.net>
33
Date: Mon, 8 Dec 2025 07:47:46 +0000
44
Subject: [PATCH 1/8] Remove -march flags
@@ -25,19 +25,19 @@ index b7d695a75..47cbcbf83 100644
2525
./getarch_2nd 0 >> $(TARGET_MAKE)
2626
./getarch_2nd 1 >> $(TARGET_CONF)
2727
diff --git a/Makefile.riscv64 b/Makefile.riscv64
28-
index 0ee26c1b5..bf21fd68d 100644
28+
index d8da98d5f..86c61553b 100644
2929
--- a/Makefile.riscv64
3030
+++ b/Makefile.riscv64
31-
@@ -14,7 +14,3 @@ ifeq ($(CORE), RISCV64_ZVL128B)
32-
CCOMMON_OPT += -march=rv64imafdcv -mabi=lp64d
33-
FCOMMON_OPT += -march=rv64imafdcv -mabi=lp64d
31+
@@ -21,7 +21,3 @@ ifeq ($(CORE), RISCV64_ZVL128B)
32+
CCOMMON_OPT += -march=$(RISCV64_OPT) -mabi=lp64d
33+
FCOMMON_OPT += -march=$(RISCV64_OPT) -mabi=lp64d
3434
endif
3535
-ifeq ($(CORE), RISCV64_GENERIC)
3636
-CCOMMON_OPT += -march=rv64imafdc -mabi=lp64d
3737
-FCOMMON_OPT += -march=rv64imafdc -mabi=lp64d
3838
-endif
3939
diff --git a/Makefile.system b/Makefile.system
40-
index 38646c3c6..540d8694c 100644
40+
index ab463f53d..4a8b17f96 100644
4141
--- a/Makefile.system
4242
+++ b/Makefile.system
4343
@@ -202,7 +202,7 @@ endif

recipes/recipes_emscripten/openblas-flang/patches/0002-Skip-linktest.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ff8c4ad19a31231053786857ae893302a2ca5b7e Mon Sep 17 00:00:00 2001
1+
From 3ec9afbcf9c7fb8498365771f9e6b8b1eed90a67 Mon Sep 17 00:00:00 2001
22
From: Isabel Paredes <isabel.paredes@quantstack.net>
33
Date: Mon, 8 Dec 2025 07:50:30 +0000
44
Subject: [PATCH 2/8] Skip linktest
@@ -8,10 +8,10 @@ Subject: [PATCH 2/8] Skip linktest
88
1 file changed, 7 insertions(+), 8 deletions(-)
99

1010
diff --git a/exports/Makefile b/exports/Makefile
11-
index 04fc64cfe..3354b0bad 100644
11+
index 176b1a766..9a80fd7ca 100644
1212
--- a/exports/Makefile
1313
+++ b/exports/Makefile
14-
@@ -196,18 +196,18 @@ ifeq ($(F_COMPILER), INTEL)
14+
@@ -199,18 +199,18 @@ ifeq ($(F_COMPILER), INTEL)
1515
$(FC) $(FFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
1616
-Wl,--whole-archive $< -Wl,--no-whole-archive \
1717
-Wl,-soname,$(INTERNALNAME) $(EXTRALIB)
@@ -33,7 +33,7 @@ index 04fc64cfe..3354b0bad 100644
3333
else
3434
#for LSB
3535
env LSBCC_SHAREDLIBS=gfortran $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
36-
@@ -235,7 +235,7 @@ endif
36+
@@ -238,7 +238,7 @@ endif
3737
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
3838
-Wl,--whole-archive $< -Wl,--no-whole-archive \
3939
$(FEXTRALIB) $(EXTRALIB)
@@ -42,7 +42,7 @@ index 04fc64cfe..3354b0bad 100644
4242
rm -f linktest
4343

4444
endif
45-
@@ -253,7 +253,7 @@ ifeq ($(OSNAME), SunOS)
45+
@@ -256,7 +256,7 @@ ifeq ($(OSNAME), SunOS)
4646
so : ../$(LIBSONAME)
4747
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
4848
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
@@ -51,9 +51,9 @@ index 04fc64cfe..3354b0bad 100644
5151
rm -f linktest
5252

5353
endif
54-
@@ -309,9 +309,8 @@ objcopy.def : $(GENSYM) ../Makefile.system ../getarch.c
54+
@@ -312,9 +312,8 @@ objcopy.def : $(GENSYM) ../Makefile.system ../getarch.c
5555
objconv.def : $(GENSYM) ../Makefile.system ../getarch.c
56-
./$(GENSYM) objconv $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
56+
./$(GENSYM) objconv $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
5757

5858
-test : linktest.c
5959
- $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
@@ -62,7 +62,7 @@ index 04fc64cfe..3354b0bad 100644
6262
+ echo OK.
6363

6464
linktest.c : $(GENSYM) ../Makefile.system ../getarch.c
65-
./$(GENSYM) linktest $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > linktest.c
65+
./$(GENSYM) linktest $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_HFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > linktest.c
6666
--
6767
2.51.0
6868

recipes/recipes_emscripten/openblas-flang/patches/0003-Add-emscripten-as-supported-arch.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ed18218029bf9450205a2fee26a601b700b79588 Mon Sep 17 00:00:00 2001
1+
From 4dffa5b09b9c02863e3a06e9c0a759378825ef73 Mon Sep 17 00:00:00 2001
22
From: Isabel Paredes <isabel.paredes@quantstack.net>
33
Date: Mon, 8 Dec 2025 07:51:01 +0000
44
Subject: [PATCH 3/8] Add emscripten as supported arch
@@ -8,10 +8,10 @@ Subject: [PATCH 3/8] Add emscripten as supported arch
88
1 file changed, 5 insertions(+)
99

1010
diff --git a/getarch.c b/getarch.c
11-
index b51c3ed64..b1493ee9f 100644
11+
index 8b7024809..f443d14f7 100644
1212
--- a/getarch.c
1313
+++ b/getarch.c
14-
@@ -1895,6 +1895,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14+
@@ -1949,6 +1949,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1515
#define OPENBLAS_SUPPORTED
1616
#endif
1717

0 commit comments

Comments
 (0)