From 25025c5b54739a6b6bd9573b89196b2c2da4c95a Mon Sep 17 00:00:00 2001 From: Matthew R Becker Date: Sat, 25 Jul 2020 07:21:36 -0500 Subject: [PATCH 1/3] ENH more run constraints --- recipe/conda_build_config.yaml | 2 +- recipe/meta.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e29ca354..adcf4613 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -27,7 +27,7 @@ ctng_vendor: #ctng_duma: # - 2.5.15 ctng_gcc_build_number: - - 9 + - 10 ctng_gmp: - 6.1.2 ctng_isl: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b570de8..288f6fda 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -155,6 +155,7 @@ outputs: - gcc_impl_{{ ctng_target_platform }} >=7.2.0 - {{ pin_subpackage("libgfortran-ng") }} - {{ pin_subpackage("libgcc-ng", max_pin=None) }} + - sysroot_{{ ctng_target_platform }} run_exports: # impose this requirement across the build/host boundary strong: @@ -223,6 +224,8 @@ outputs: requirements: host: - sysroot_{{ ctng_target_platform }} + run_constrained: + - sysroot_{{ ctng_target_platform }} >=2.12 test: commands: - test -f ${PREFIX}/lib/libstdc++.so @@ -244,6 +247,7 @@ outputs: - {{ pin_subpackage("_openmp_mutex", max_pin=None) }} run_constrained: - {{ pin_subpackage("libgomp", exact=True) }} + - sysroot_{{ ctng_target_platform }} >=2.12 build: number: {{ build_num }} detect_binary_files_with_prefix: False @@ -272,6 +276,8 @@ outputs: - sysroot_{{ ctng_target_platform }} run: - _libgcc_mutex {{ _libgcc_mutex }} # [linux64 or ppc64le] + run_constrained: + - sysroot_{{ ctng_target_platform }} >=2.12 build: number: {{ build_num }} detect_binary_files_with_prefix: False @@ -307,6 +313,7 @@ outputs: run_constrained: # conflict with previous name - openmp_impl 9999 + - sysroot_{{ ctng_target_platform }} >=2.12 build: string: 0_gnu run_exports: @@ -336,6 +343,8 @@ outputs: requirements: host: - sysroot_{{ ctng_target_platform }} + run_constrained: + - sysroot_{{ ctng_target_platform }} >=2.12 test: commands: - test -f ${PREFIX}/lib/libgfortran.so From c2e3e9d10b525da8e32e0dc50ffc02a0098b229a Mon Sep 17 00:00:00 2001 From: Matthew R Becker Date: Sat, 25 Jul 2020 07:23:59 -0500 Subject: [PATCH 2/3] do not need this one --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 288f6fda..65ceb242 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -313,7 +313,6 @@ outputs: run_constrained: # conflict with previous name - openmp_impl 9999 - - sysroot_{{ ctng_target_platform }} >=2.12 build: string: 0_gnu run_exports: @@ -344,7 +343,7 @@ outputs: host: - sysroot_{{ ctng_target_platform }} run_constrained: - - sysroot_{{ ctng_target_platform }} >=2.12 + - sysroot_{{ ctng_target_platform }} >=2.12 test: commands: - test -f ${PREFIX}/lib/libgfortran.so From 8b56d0ee2f272cd0ba7cb90edbd735b34068e113 Mon Sep 17 00:00:00 2001 From: Matthew R Becker Date: Sat, 25 Jul 2020 08:13:01 -0500 Subject: [PATCH 3/3] Update meta.yaml --- recipe/meta.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 65ceb242..ac1085ad 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -224,8 +224,6 @@ outputs: requirements: host: - sysroot_{{ ctng_target_platform }} - run_constrained: - - sysroot_{{ ctng_target_platform }} >=2.12 test: commands: - test -f ${PREFIX}/lib/libstdc++.so @@ -247,7 +245,6 @@ outputs: - {{ pin_subpackage("_openmp_mutex", max_pin=None) }} run_constrained: - {{ pin_subpackage("libgomp", exact=True) }} - - sysroot_{{ ctng_target_platform }} >=2.12 build: number: {{ build_num }} detect_binary_files_with_prefix: False @@ -276,8 +273,6 @@ outputs: - sysroot_{{ ctng_target_platform }} run: - _libgcc_mutex {{ _libgcc_mutex }} # [linux64 or ppc64le] - run_constrained: - - sysroot_{{ ctng_target_platform }} >=2.12 build: number: {{ build_num }} detect_binary_files_with_prefix: False @@ -342,8 +337,6 @@ outputs: requirements: host: - sysroot_{{ ctng_target_platform }} - run_constrained: - - sysroot_{{ ctng_target_platform }} >=2.12 test: commands: - test -f ${PREFIX}/lib/libgfortran.so