From 029035b51ac1e69d6961bfa0765a65da2f406fc9 Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Wed, 7 Jan 2026 20:45:54 +0200
Subject: [PATCH] [intel-mkl] Fix for dynamic and static (#49216)

---
 ports/intel-mkl/portfile.cmake | 16 +++++++++++-----
 ports/intel-mkl/vcpkg.json     |  1 +
 versions/baseline.json         |  2 +-
 versions/i-/intel-mkl.json     |  5 +++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake
index be913c398c..7284fdc15e 100644
--- a/ports/intel-mkl/portfile.cmake
+++ b/ports/intel-mkl/portfile.cmake
@@ -128,6 +128,9 @@ vcpkg_execute_required_process(
 set(mkl_dir "${extract_1_dir}/_installdir/mkl/${mkl_short_version}")
 file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 file(COPY "${mkl_dir}/${package_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  file(COPY "${mkl_dir}/${runtime_dir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/")
+endif()
 
 file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\${exec_prefix}/${package_libdir}" "\${exec_prefix}/lib/" IGNORE_UNCHANGED)
@@ -135,6 +138,9 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\$
 set(compiler_dir "${extract_1_dir}/_installdir/compiler/${mkl_short_version}")
 if(threading STREQUAL "intel_thread")
   file(COPY "${compiler_dir}/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/")
+  if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(COPY "${compiler_dir}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/")
+  endif()
   file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
   vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
 endif()
@@ -171,11 +177,9 @@ endif()
 file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}" "bin")
-if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "define_param(MKL_LINK DEFAULT_MKL_LINK MKL_LINK_LIST)" 
-[[define_param(MKL_LINK DEFAULT_MKL_LINK MKL_LINK_LIST)
- set(MKL_LINK "static")
-]])
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "set(DEFAULT_MKL_LINK dynamic)" "set(DEFAULT_MKL_LINK static)")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "set(LIB_EXT \".so\")" "set(LIB_EXT \".a\")")
 endif()
 #TODO: Hardcode settings from portfile in config.cmake
 #TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. 
@@ -187,6 +191,8 @@ vcpkg_install_copyright(FILE_LIST "${package_path}/licenses/license.htm")
 file(REMOVE_RECURSE
     "${extract_0_dir}"
     "${extract_1_dir}"
+    "${CURRENT_PACKAGES_DIR}/bin/compiler"
+    "${CURRENT_PACKAGES_DIR}/lib/cmake"
 )
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json
index efd818c613..26b63c4749 100644
--- a/ports/intel-mkl/vcpkg.json
+++ b/ports/intel-mkl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "intel-mkl",
   "version": "2025.2.0",
+  "port-version": 1,
   "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.",
   "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 48276b493c..d65123acb1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3982,7 +3982,7 @@
     },
     "intel-mkl": {
       "baseline": "2025.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "intelrdfpmathlib": {
       "baseline": "20U2",
diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json
index f78e2a9277..23503208de 100644
--- a/versions/i-/intel-mkl.json
+++ b/versions/i-/intel-mkl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1222d2ac2c699ac0664b004a12aad9239ac94d5",
+      "version": "2025.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "68757c04f7759c50a2cd81b097e862da93673334",
       "version": "2025.2.0",