From ac8f14ddd4cfec68da193c663b98a376b15aa6a3 Mon Sep 17 00:00:00 2001 From: Jaap Aarts Date: Thu, 27 Mar 2025 17:40:17 +0100 Subject: [PATCH] [blas] Enable openblas on mingw (#44583) Co-authored-by: Kai Pastor --- ports/blas/portfile.cmake | 1 + ports/blas/vcpkg.json | 6 +++--- versions/b-/blas.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index 1b2db3c39e..e8d5b48e96 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -49,6 +49,7 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(cflags "-framework Accelerate") elseif(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + OR VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS OR NOT (VCPKG_LIBRARY_LINKAGE STREQUAL "static")) set(BLA_VENDOR OpenBLAS) diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index 69b62707fa..4b1ced93a4 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!", "name": "blas", "version-date": "2023-04-14", - "port-version": 2, + "port-version": 3, "description": "Metapackage for packages which provide BLAS", "license": null, "dependencies": [ @@ -11,11 +11,11 @@ "features": [ "cblas" ], - "platform": "!osx & !ios & !uwp & !(windows & arm) & windows & static" + "platform": "!osx & !ios & !uwp & !(windows & arm) & windows & static & !mingw" }, { "name": "openblas", - "platform": "!osx & !ios & (uwp | (windows & arm) | !windows | !static)" + "platform": "!osx & !ios & (uwp | (windows & arm) | !windows | !static | mingw)" }, { "name": "vcpkg-cmake", diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 93222378b9..42dd1f147c 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6155e3a08c8a572e1e8ab225b6f0fdb56e84eca1", + "version-date": "2023-04-14", + "port-version": 3 + }, { "git-tree": "b5910f73b446a5f52ca520bafd134f3360b1698f", "version-date": "2023-04-14", diff --git a/versions/baseline.json b/versions/baseline.json index 2dd7fb8fc2..3828898b9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -702,7 +702,7 @@ }, "blas": { "baseline": "2023-04-14", - "port-version": 2 + "port-version": 3 }, "blaze": { "baseline": "3.8.2",