From 1167a7c91f8221c92c7f2216de3de5344d558b8f Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 11:16:25 -0500
Subject: [PATCH 01/15] Add building wheel packages

---
 conda-recipe/bld.bat   | 41 +++++++++++++++++++++++++++++++++++++----
 conda-recipe/build.sh  | 33 ++++++++++++++++++++++++++++++---
 conda-recipe/meta.yaml | 14 ++++++++------
 pyproject.toml         |  2 +-
 4 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
index 0eddfe9..3960aa0 100644
--- a/conda-recipe/bld.bat
+++ b/conda-recipe/bld.bat
@@ -1,6 +1,39 @@
-
-@rem Remember to activate compiler, if needed
+echo on
+rem set CFLAGS=-I%PREFIX%\Library\include %CFLAGS%
+rem set LDFLAGS=/LIBPATH:%PREFIX% %LDFLAGS%
 
 set MKLROOT=%CONDA_PREFIX%
-%PYTHON% -m pip install --no-build-isolation --no-deps .
-if errorlevel 1 exit 1
+
+"%PYTHON%" setup.py clean --all
+
+:: Make CMake verbose
+set "VERBOSE=1"
+
+:: -wnx flags mean: --wheel --no-isolation --skip-dependency-check
+%PYTHON% -m build -w -n -x
+if %ERRORLEVEL% neq 0 exit 1
+
+:: `pip install dist\numpy*.whl` does not work on windows,
+:: so use a loop; there's only one wheel in dist/ anyway
+for /f %%f in ('dir /b /S .\dist') do (
+  %PYTHON% -m wheel tags --remove --build %GIT_DESCRIBE_NUMBER% %%f
+  if %ERRORLEVEL% neq 0 exit 1
+)
+
+:: wheel file was renamed
+for /f %%f in ('dir /b /S .\dist') do (
+  %PYTHON% -m pip install %%f ^
+    --no-build-isolation ^
+    --no-deps ^
+    --only-binary :all: ^
+    --no-index ^
+    --prefix %PREFIX% ^
+    -vv
+  if %ERRORLEVEL% neq 0 exit 1
+)
+
+:: Copy wheel package
+if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
+  copy dist\mkl_service*.whl %WHEELS_OUTPUT_FOLDER%
+  if %ERRORLEVEL% neq 0 exit 1
+)
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index df09449..a38e644 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -1,5 +1,32 @@
-#!/bin/bash -x
+#!/bin/bash
+set -ex
 
-# make sure that compiler has been sourced, if necessary
+export MKLROOT=$CONDA_PREFIX
 
-MKLROOT=$CONDA_PREFIX $PYTHON -m pip install --no-build-isolation --no-deps .
+read -r GLIBC_MAJOR GLIBC_MINOR <<<"$(conda list '^sysroot_linux-64$' \
+    | tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
+
+${PYTHON} setup.py clean --all
+
+# Make CMake verbose
+export VERBOSE=1
+
+# -wnx flags mean: --wheel --no-isolation --skip-dependency-check
+${PYTHON} -m build -w -n -x
+
+${PYTHON} -m wheel tags --remove --build "$GIT_DESCRIBE_NUMBER" \
+    --platform-tag "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64" \
+    dist/mkl_service*.whl
+
+${PYTHON} -m pip install dist/mkl_service*.whl \
+    --no-build-isolation \
+    --no-deps \
+    --only-binary :all: \
+    --no-index \
+    --prefix "${PREFIX}" \
+    -vv
+
+# Copy wheel package
+if [[ -d "${WHEELS_OUTPUT_FOLDER}" ]]; then
+    cp dist/mkl_service*.whl "${WHEELS_OUTPUT_FOLDER[@]}"
+fi
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 33c683a..07541c1 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,15 +1,14 @@
-{% set version = "2.5.0" %}
-{% set buildnumber = 0 %}
-
 package:
     name: mkl-service
-    version: {{ version }}
+    version: {{ GIT_DESCRIBE_TAG }}
 
 source:
     path: ..
 
 build:
-    number: {{ buildnumber }}
+    number: {{ GIT_DESCRIBE_NUMBER }}
+    script_env:
+      - WHEELS_OUTPUT_FOLDER
     ignore_run_exports:
       - blas
       - mkl-service
@@ -19,12 +18,15 @@ requirements:
       - {{ compiler('c') }}
     host:
       - python
+      - pip >=25.0
       - setuptools >=77
       - mkl-devel
       - cython
+      - wheel >=0.45.1
+      - python-build >=1.2.2
     run:
       - python
-      - mkl
+      - {{ pin_compatible('mkl') }}
 
 test:
     requires:
diff --git a/pyproject.toml b/pyproject.toml
index 2efd692..f8c4837 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,7 +25,7 @@
 
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools>=77", "Cython"]
+requires = ["setuptools>=77", "Cython", "wheel>=0.45.1", "build>=1.2.2"]
 
 [project]
 authors = [

From b185586bc65c5abb822d5729b591034da148315e Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 11:43:40 -0500
Subject: [PATCH 02/15] Extend GH workflow with Conda build to upload wheels

---
 .github/workflows/conda-package.yml | 30 +++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index b11072e..2dab07f 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -55,6 +55,12 @@ jobs:
       - name: Install conda-build
         run: conda install conda-build
 
+      - name: Store conda paths as envs
+        shell: bash -el {0}
+        run: |
+          echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/linux-64/" >> $GITHUB_ENV
+          echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> $GITHUB_ENV
+
       - name: Build conda package
         run: |
           CHANNELS="-c conda-forge -c https://software.repos.intel.com/python/conda --override-channels"
@@ -71,7 +77,13 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
-          path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
+          path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
+
+      - name: Upload wheels artifact
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
+          path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
 
   build_windows:
     runs-on: windows-latest
@@ -79,8 +91,6 @@ jobs:
     strategy:
       matrix:
         python: ['3.9', '3.10', '3.11', '3.12', '3.13']
-    env:
-      conda-bld: C:\Miniconda\conda-bld\win-64\
 
     steps:
       - name: Cancel Previous Runs
@@ -115,6 +125,12 @@ jobs:
       - name: Setup MSVC
         uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
 
+      - name: Store conda paths as envs
+        shell: bash -el {0}
+        run: |
+          echo "CONDA_BLD=$CONDA_PREFIX\conda-bld\win-64\" >> $GITHUB_ENV
+          echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE\" >> $GITHUB_ENV
+
       - name: Build conda package
         run: conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels conda-recipe
 
@@ -122,7 +138,13 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
-          path: ${{ env.conda-bld }}${{ env.PACKAGE_NAME }}-*.conda
+          path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
+
+      - name: Upload wheels artifact
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
+          path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
 
   test_linux:
     needs: build_linux

From eaefa3534e0bf5518683f3dbc7261fc22b10cdff Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 11:56:01 -0500
Subject: [PATCH 03/15] Correct path to the conda build folder

---
 .github/workflows/conda-package.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index 2dab07f..d4e7e69 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Store conda paths as envs
         shell: bash -el {0}
         run: |
-          echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/linux-64/" >> $GITHUB_ENV
+          echo "CONDA_BLD=/usr/share/miniconda/conda-bld/linux-64/" >> $GITHUB_ENV
           echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> $GITHUB_ENV
 
       - name: Build conda package
@@ -83,7 +83,7 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
-          path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
+          path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
 
   build_windows:
     runs-on: windows-latest
@@ -128,8 +128,8 @@ jobs:
       - name: Store conda paths as envs
         shell: bash -el {0}
         run: |
-          echo "CONDA_BLD=$CONDA_PREFIX\conda-bld\win-64\" >> $GITHUB_ENV
-          echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE\" >> $GITHUB_ENV
+          echo "CONDA_BLD=C:\\Miniconda\\conda-bld\\win-64\\" >> $GITHUB_ENV
+          echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE\\" >> $GITHUB_ENV
 
       - name: Build conda package
         run: conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels conda-recipe
@@ -144,7 +144,7 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
-          path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.PACKAGE_NAME }}-*.whl
+          path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
 
   test_linux:
     needs: build_linux

From 837ecca7d49161536b8ccdc89d781cf7c5c6ae43 Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 13:20:48 -0500
Subject: [PATCH 04/15] Setting rpath to _mklinit.*.so

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index b5fcc2b..8aed3de 100644
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,7 @@ def extensions():
             include_dirs=mkl_include_dirs,
             libraries=mkl_libraries + (["pthread"] if os.name == "posix" else []),
             library_dirs=mkl_library_dirs,
+            runtime_library_dirs=["$ORIGIN/../..", "$ORIGIN/../../.."],
             extra_compile_args=[
                 "-DNDEBUG"
                 # "-g", "-O2", "-Wall",

From 8eb354df19e234923faf9d33988fc50239e333bd Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 13:33:30 -0500
Subject: [PATCH 05/15] No need to set RPATH on Windows

---
 setup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8aed3de..e9ca83f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
 
 
 import os
+import sys
 from os.path import join
 
 import Cython.Build
@@ -38,6 +39,7 @@ def extensions():
             "include_dirs": [join(mkl_root, "include")],
             "library_dirs": [join(mkl_root, "lib"), join(mkl_root, "lib", "intel64")],
             "libraries": ["mkl_rt"],
+            "rpaths" : ["$ORIGIN/../..", "$ORIGIN/../../.."] if sys.platform != 'win32' else [],
         }
     else:
         raise ValueError("MKLROOT environment variable not set.")
@@ -45,6 +47,7 @@ def extensions():
     mkl_include_dirs = mkl_info.get("include_dirs", [])
     mkl_library_dirs = mkl_info.get("library_dirs", [])
     mkl_libraries = mkl_info.get("libraries", ["mkl_rt"])
+    mkl_rpaths = mkl_info.get("rpaths", [])
 
     defs = []
     if any(["mkl_rt" in li for li in mkl_libraries]):
@@ -59,7 +62,7 @@ def extensions():
             include_dirs=mkl_include_dirs,
             libraries=mkl_libraries + (["pthread"] if os.name == "posix" else []),
             library_dirs=mkl_library_dirs,
-            runtime_library_dirs=["$ORIGIN/../..", "$ORIGIN/../../.."],
+            runtime_library_dirs=mkl_rpaths,
             extra_compile_args=[
                 "-DNDEBUG"
                 # "-g", "-O2", "-Wall",
@@ -75,6 +78,7 @@ def extensions():
             include_dirs=mkl_include_dirs,
             library_dirs=mkl_library_dirs,
             libraries=mkl_libraries,
+            runtime_library_dirs=mkl_rpaths,
             extra_compile_args=[
                 "-DNDEBUG"
                 # "-g", "-O2", "-Wall",

From 1df98003586eb631f634eebdad245d5f19061e48 Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 13:39:14 -0500
Subject: [PATCH 06/15] Fix pre-commit

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e9ca83f..b8fb846 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,9 @@ def extensions():
             "include_dirs": [join(mkl_root, "include")],
             "library_dirs": [join(mkl_root, "lib"), join(mkl_root, "lib", "intel64")],
             "libraries": ["mkl_rt"],
-            "rpaths" : ["$ORIGIN/../..", "$ORIGIN/../../.."] if sys.platform != 'win32' else [],
+            "rpaths": (
+                ["$ORIGIN/../..", "$ORIGIN/../../.."] if sys.platform != "win32" else []
+            ),
         }
     else:
         raise ValueError("MKLROOT environment variable not set.")

From aacc1d0ae3e39d32509adb8338d0e817b5480c23 Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 13:39:36 -0500
Subject: [PATCH 07/15] Set release date to 2.5.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 568f496..2ee4dbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.0] (05/DD/2025)
+## [2.5.0] (06/03/2025)
 
 ### Added
 * Added support for python 3.13 [gh-72](github.com/IntelPython/mkl-service/pull/72)

From a029b799d91db0bee3f78f33b91d5c941848cdcb Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 13:44:42 -0500
Subject: [PATCH 08/15] Add change to the changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ee4dbb..7847984 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.1] (06/27/2025)
+
+### Fixed
+* Resolved import issue in the virtual environment which broke loading of MKL libs [gh-85](github.com/IntelPython/mkl-service/pull/85)
+
 ## [2.5.0] (06/03/2025)
 
 ### Added

From 2e5ec2589c2dfe697555e681849ffd9feb36a8f4 Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 13:50:17 -0500
Subject: [PATCH 09/15] Rolled back changes with fetching build number from
 GIT_DESCRIBE envs

---
 conda-recipe/bld.bat   | 2 +-
 conda-recipe/build.sh  | 2 +-
 conda-recipe/meta.yaml | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
index 3960aa0..6c2b72f 100644
--- a/conda-recipe/bld.bat
+++ b/conda-recipe/bld.bat
@@ -16,7 +16,7 @@ if %ERRORLEVEL% neq 0 exit 1
 :: `pip install dist\numpy*.whl` does not work on windows,
 :: so use a loop; there's only one wheel in dist/ anyway
 for /f %%f in ('dir /b /S .\dist') do (
-  %PYTHON% -m wheel tags --remove --build %GIT_DESCRIBE_NUMBER% %%f
+  %PYTHON% -m wheel tags --remove %%f
   if %ERRORLEVEL% neq 0 exit 1
 )
 
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index a38e644..6bfa533 100644
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -14,7 +14,7 @@ export VERBOSE=1
 # -wnx flags mean: --wheel --no-isolation --skip-dependency-check
 ${PYTHON} -m build -w -n -x
 
-${PYTHON} -m wheel tags --remove --build "$GIT_DESCRIBE_NUMBER" \
+${PYTHON} -m wheel tags --remove \
     --platform-tag "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64" \
     dist/mkl_service*.whl
 
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 07541c1..7320e3f 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -1,12 +1,15 @@
+{% set version = "2.5.1" %}
+{% set buildnumber = 0 %}
+
 package:
     name: mkl-service
-    version: {{ GIT_DESCRIBE_TAG }}
+    version: {{ version }}
 
 source:
     path: ..
 
 build:
-    number: {{ GIT_DESCRIBE_NUMBER }}
+    number: {{ buildnumber }}
     script_env:
       - WHEELS_OUTPUT_FOLDER
     ignore_run_exports:

From 023d4bea3f02209bd09aa524a498b2e4de9fb363 Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 14:02:30 -0500
Subject: [PATCH 10/15] No need to call wheel tags on Windows

---
 conda-recipe/bld.bat | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
index 6c2b72f..90a55f4 100644
--- a/conda-recipe/bld.bat
+++ b/conda-recipe/bld.bat
@@ -13,13 +13,6 @@ set "VERBOSE=1"
 %PYTHON% -m build -w -n -x
 if %ERRORLEVEL% neq 0 exit 1
 
-:: `pip install dist\numpy*.whl` does not work on windows,
-:: so use a loop; there's only one wheel in dist/ anyway
-for /f %%f in ('dir /b /S .\dist') do (
-  %PYTHON% -m wheel tags --remove %%f
-  if %ERRORLEVEL% neq 0 exit 1
-)
-
 :: wheel file was renamed
 for /f %%f in ('dir /b /S .\dist') do (
   %PYTHON% -m pip install %%f ^

From 65f257c929865526f7a15d3533dfef33d82d33bb Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 15:26:20 -0500
Subject: [PATCH 11/15] Add explicit conda-build pinning to sysroot 2.28

---
 conda-recipe/conda_build_config.yaml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 conda-recipe/conda_build_config.yaml

diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
new file mode 100644
index 0000000..c64382b
--- /dev/null
+++ b/conda-recipe/conda_build_config.yaml
@@ -0,0 +1,4 @@
+c_stdlib:                     # [linux]
+    - sysroot                 # [linux]
+c_stdlib_version:             # [linux]
+    - '2.28'                  # [linux]

From 87a2b46af8af6720cbbb84f69d1ce3b56b54af89 Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 15:34:03 -0500
Subject: [PATCH 12/15] Adding gcc and gxx to the conda-build config

---
 conda-recipe/conda_build_config.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
index c64382b..ef931ba 100644
--- a/conda-recipe/conda_build_config.yaml
+++ b/conda-recipe/conda_build_config.yaml
@@ -1,3 +1,9 @@
+c_compiler:                   # [linux]
+    - gcc                     # [linux]
+cxx_compiler:                 # [linux]
+    - gxx                     # [linux]
+cxx_compiler_version:         # [linux]
+    - '14'                    # [linux]
 c_stdlib:                     # [linux]
     - sysroot                 # [linux]
 c_stdlib_version:             # [linux]

From b3e9c3e314531d3ee005868d43d688ad7d359d1a Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 15:52:55 -0500
Subject: [PATCH 13/15] Add stdlib to build dep

---
 conda-recipe/conda_build_config.yaml | 6 ++++++
 conda-recipe/meta.yaml               | 1 +
 2 files changed, 7 insertions(+)

diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
index ef931ba..d4b34a3 100644
--- a/conda-recipe/conda_build_config.yaml
+++ b/conda-recipe/conda_build_config.yaml
@@ -8,3 +8,9 @@ c_stdlib:                     # [linux]
     - sysroot                 # [linux]
 c_stdlib_version:             # [linux]
     - '2.28'                  # [linux]
+c_stdlib:                     # [win]
+    - vs                      # [win]
+cxx_compiler:                 # [win]
+    - vs2022                  # [win]
+c_compiler:                   # [win]
+    - vs2022                  # [win]
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 7320e3f..259158a 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -19,6 +19,7 @@ build:
 requirements:
     build:
       - {{ compiler('c') }}
+      - {{ stdlib('c') }}
     host:
       - python
       - pip >=25.0

From ceb1091374e7b52b681acf659f6002f03fae4c6d Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Thu, 26 Jun 2025 15:56:41 -0500
Subject: [PATCH 14/15] Adding rpaths to mkl_info dict doesn't require mkl_root
 check

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index b8fb846..23bac56 100644
--- a/setup.py
+++ b/setup.py
@@ -39,13 +39,13 @@ def extensions():
             "include_dirs": [join(mkl_root, "include")],
             "library_dirs": [join(mkl_root, "lib"), join(mkl_root, "lib", "intel64")],
             "libraries": ["mkl_rt"],
-            "rpaths": (
-                ["$ORIGIN/../..", "$ORIGIN/../../.."] if sys.platform != "win32" else []
-            ),
         }
     else:
         raise ValueError("MKLROOT environment variable not set.")
 
+    if sys.platform != "win32":
+        mkl_info["rpaths"] = ["$ORIGIN/../..", "$ORIGIN/../../.."]
+
     mkl_include_dirs = mkl_info.get("include_dirs", [])
     mkl_library_dirs = mkl_info.get("library_dirs", [])
     mkl_libraries = mkl_info.get("libraries", ["mkl_rt"])

From 9adf0603e5b206d1644d557fa8f3895320f1c3fb Mon Sep 17 00:00:00 2001
From: Anton Volkov <antonwolfy@gmail.com>
Date: Fri, 27 Jun 2025 05:36:09 -0500
Subject: [PATCH 15/15] Step version to 2.5.1

---
 mkl/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkl/_version.py b/mkl/_version.py
index 50062f8..7a2056f 100644
--- a/mkl/_version.py
+++ b/mkl/_version.py
@@ -1 +1 @@
-__version__ = "2.5.0"
+__version__ = "2.5.1"