aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorBilly Robert O'Neal III <bion@microsoft.com>2020-04-29 19:33:41 -0700
committerBilly O'Neal <billy.oneal@gmail.com>2020-04-30 21:51:31 -0700
commit6aab6e0d3dfece6c1f457671c5b3688435e5f3f0 (patch)
tree6a4b42c273b9e48650e9a6bc2fb16eb05ad2b57f /ports
parent7ebf6648d8c8ee64e0219834e84da7d6d4c454d3 (diff)
downloadvcpkg-6aab6e0d3dfece6c1f457671c5b3688435e5f3f0.tar.gz
vcpkg-6aab6e0d3dfece6c1f457671c5b3688435e5f3f0.zip
[OpenBLAS] Upgrade to 0.3.9 + a patch to fix AVX512 (which is now present on the VMs)
Diffstat (limited to 'ports')
-rw-r--r--ports/openblas/CONTROL2
-rw-r--r--ports/openblas/github_2481.patch23
-rw-r--r--ports/openblas/portfile.cmake5
3 files changed, 27 insertions, 3 deletions
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index 1b1cc5741..3c2b0b7eb 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,5 +1,5 @@
Source: openblas
-Version: 0.3.7
+Version: 0.3.9-1
Homepage: https://github.com/xianyi/OpenBLAS
Build-Depends: pthread (linux)
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/github_2481.patch b/ports/openblas/github_2481.patch
new file mode 100644
index 000000000..bedffc36c
--- /dev/null
+++ b/ports/openblas/github_2481.patch
@@ -0,0 +1,23 @@
+From 21f6c4b5a972683f7228e5ad446bc940947c2d2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
+ =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <chinoune.mehdi@gmail.com>
+Date: Mon, 2 Mar 2020 17:22:28 +0100
+Subject: [PATCH] fixes #2480
+
+---
+ cmake/cc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/cc.cmake b/cmake/cc.cmake
+index 22217575c..d5551147c 100644
+--- a/cmake/cc.cmake
++++ b/cmake/cc.cmake
+@@ -99,7 +99,7 @@ endif ()
+ if (${CORE} STREQUAL "SKYLAKEX")
+ if (NOT DYNAMIC_ARCH)
+ if (NOT NO_AVX512)
+- set (CCOMMON_OPT = "${CCOMMON_OPT} -march=skylake-avx512")
++ set (CCOMMON_OPT "${CCOMMON_OPT} -march=skylake-avx512")
+ endif ()
+ endif ()
+ endif ()
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index 17112279e..2decb5883 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -3,13 +3,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xianyi/OpenBLAS
- REF 5f36f18148603facb6c3540e673610d6b24cbfbb # v0.3.7
- SHA512 c1abcfd6fbf6ae3efa28053523ffb3d72aefaa279594347bfd9910c40f25778421b8d1d2d4dc6c934c9def40642942bb74fe76e06c2d96b1898ea61204a95540
+ REF v0.3.9
+ SHA512 e34da25b3aaf959ec12826ac68c81e739e453d44f2dba28b15e57d7a827edc4d5f42988e9b6d98ac07999940be7b5876246cb3a980e590ae87f77f4c2f12f40a
HEAD_REF develop
PATCHES
uwp.patch
fix-space-path.patch
fix-redefinition-function.patch
+ github_2481.patch
)
find_program(GIT NAMES git git.cmd)