From 699fb2ed668aa28bd25c251f6cc7e9e4c3166b46 Mon Sep 17 00:00:00 2001 From: froejdh_e Date: Thu, 27 Mar 2025 16:05:32 +0100 Subject: [PATCH] fixed conda build --- conda-recipe/conda_build_config.yaml | 6 ++++++ conda-recipe/meta.yaml | 30 +++++++--------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml index 0f51da017..6e37cf5c5 100644 --- a/conda-recipe/conda_build_config.yaml +++ b/conda-recipe/conda_build_config.yaml @@ -6,3 +6,9 @@ python: - 3.12 - 3.13 + +c_stdlib: + - sysroot # [linux] + +c_stdlib_version: # [linux] + - 2.17 # [linux] diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 076e37ebc..61ed55e94 100755 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -15,36 +15,19 @@ build: requirements: build: - {{ compiler('c') }} + - {{stdlib('c')}} - {{compiler('cxx')}} - cmake + - ninja - qt 5.* - - xorg-libx11 - - xorg-libice - - xorg-libxext - - xorg-libsm - - xorg-libxau - - xorg-libxrender - - xorg-libxfixes - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-libegl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - - expat host: - libstdcxx-ng - libgcc-ng - - xorg-libx11 - - xorg-libice - - xorg-libxext - - xorg-libsm - - xorg-libxau - - xorg-libxrender - - xorg-libxfixes - - expat - + - libgl-devel + - libtiff + - zlib + run: - libstdcxx-ng - libgcc-ng @@ -123,3 +106,4 @@ outputs: run: - {{ pin_subpackage('slsdetlib', exact=True) }} - expat +