diff --git a/RELEASE.txt b/RELEASE.txt index ff6aa51fb..aec864ed6 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,4 +1,4 @@ -SLS Detector Package Minor Release 9.1.0 released on 26.03.2025 +SLS Detector Package Minor Release 9.1.0 released on 28.03.2025 =============================================================== This document describes the differences between v9.1.0 and v9.0.0 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..b6523a7e6 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 + - cmake<=3.28 + - 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 +