From d8d0371864a6cfdb76b3a11ccd56faeed302836f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <joschonb@microsoft.com>
Date: Mon, 3 Jan 2022 12:37:28 +0100
Subject: [PATCH 1/4] Fix FindLAPACK.cmake for clapack

---
 ports/clapack/FindLAPACK.cmake | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake
index aa546e672be054..205e6b1bfc79ab 100644
--- a/ports/clapack/FindLAPACK.cmake
+++ b/ports/clapack/FindLAPACK.cmake
@@ -74,7 +74,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_dependency(Threads)
 
 if(UNIX)
-  find_library(ADDITIONAL_LAPACK_LIBRARY m)
+  set(ADDITIONAL_LAPACK_LIBRARY "m")
   set(PTHREAD_LINK_NAME "-pthread")
 endif()
 
@@ -166,6 +166,14 @@ set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
 
 find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
 mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY)
+set(CLAPACK_FOUND "${LAPACK_FOUND}" CACHE STRING "" FORCE)
+
+set(oF2C_LIBRARY_RELEASE "${oF2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(oF2C_LIBRARY_DEBUG "${oF2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
+set(oLAPACK_LIBRARY_RELEASE "${oLAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(oLAPACK_LIBRARY_DEBUG "${oLAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
+set(LAPACK_BLAS_LIBRARY_RELEASE "${LAPACK_BLAS_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(LAPACK_BLAS_LIBRARY_DEBUG "${LAPACK_BLAS_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
 
 #TARGETS
 if(CLAPACK_FOUND AND NOT TARGET clapack::clapack)

From 174ca8956445b70a25f3bb90ca21c39b329ed358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <joschonb@microsoft.com>
Date: Mon, 3 Jan 2022 14:09:38 +0100
Subject: [PATCH 2/4] Fix

---
 versions/c-/clapack.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json
index f0700bc5a0ffa4..e22398513154eb 100644
--- a/versions/c-/clapack.json
+++ b/versions/c-/clapack.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e",
+      "git-tree": "ab15c55af259508496e0a8b09132b33dd8e8cf6a",
       "version-string": "3.2.1",
       "port-version": 19
     },

From e16a051288257d1c4aacebba5ffe0cae522d9744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <joschonb@microsoft.com>
Date: Mon, 3 Jan 2022 14:12:12 +0100
Subject: [PATCH 3/4] Fix

---
 ports/clapack/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json
index f0fd61e8f63342..421aca44c8dff1 100644
--- a/ports/clapack/vcpkg.json
+++ b/ports/clapack/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clapack",
   "version-string": "3.2.1",
-  "port-version": 19,
+  "port-version": 20,
   "description": "CLAPACK (f2c'ed version of LAPACK)",
   "homepage": "https://www.netlib.org/clapack",
   "dependencies": [

From 5459de3266335a87aebdcc59cb954f6fbb08e057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <joschonb@microsoft.com>
Date: Mon, 3 Jan 2022 14:13:01 +0100
Subject: [PATCH 4/4] Fix

---
 versions/baseline.json   | 2 +-
 versions/c-/clapack.json | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 31ade383e999c8..e0c6c3d2605c27 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1374,7 +1374,7 @@
     },
     "clapack": {
       "baseline": "3.2.1",
-      "port-version": 19
+      "port-version": 20
     },
     "clara": {
       "baseline": "1.1.5",
diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json
index e22398513154eb..8033a027b68996 100644
--- a/versions/c-/clapack.json
+++ b/versions/c-/clapack.json
@@ -1,7 +1,12 @@
 {
   "versions": [
     {
-      "git-tree": "ab15c55af259508496e0a8b09132b33dd8e8cf6a",
+      "git-tree": "487ee4248a8d0cebf67b1a466fd17404d3d74156",
+      "version-string": "3.2.1",
+      "port-version": 20
+    },
+    {
+      "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e",
       "version-string": "3.2.1",
       "port-version": 19
     },