From 75a8cba74587f6359420c055591379f422f2e614 Mon Sep 17 00:00:00 2001 From: Ryan Volz Date: Thu, 20 Oct 2022 14:50:24 -0400 Subject: [PATCH] ci: Enable thrift for conda build on Windows. Signed-off-by: Ryan Volz --- .packaging/conda_recipe/meta.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.packaging/conda_recipe/meta.yaml b/.packaging/conda_recipe/meta.yaml index 2eb007edc14..8a04d743c92 100644 --- a/.packaging/conda_recipe/meta.yaml +++ b/.packaging/conda_recipe/meta.yaml @@ -36,6 +36,7 @@ requirements: - git - ninja - pkg-config # [not win] + - thrift-compiler - sysroot_linux-64 2.17 # [linux64] - thrift-compiler # cross-compilation requirements @@ -67,7 +68,7 @@ requirements: - gmp # [not win] - gsl - libsndfile - - libthrift # [not win] + - libthrift - mako - mpir # [win] - numpy @@ -77,7 +78,7 @@ requirements: - pybind11-abi - python - spdlog - - thrift # [not win] + - thrift - volk # gnuradio.audio - alsa-lib # [linux] @@ -132,7 +133,7 @@ requirements: - scipy # need setuptools because modtool uses pkg_resources - setuptools - - thrift # [not win] + - thrift run_constrained: # conflict with the non-dev conda-forge packages # by constraining to non-existent version