From 1eb5999ebe9610de7e36c484b095821aff1609c6 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 9 May 2024 16:40:32 -0400 Subject: [PATCH] adapt recipe --- .gitignore | 2 +- abs.yaml | 2 ++ recipe/meta.yaml | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 abs.yaml diff --git a/.gitignore b/.gitignore index 179afe5..f044c58 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ # Ignore all files and folders in root * -!/conda-forge.yml +!/abs.yml # Don't ignore any files/folders if the parent folder is 'un-ignored' # This also avoids warnings when adding an already-checked file with an ignored parent. diff --git a/abs.yaml b/abs.yaml new file mode 100644 index 0000000..31f83d2 --- /dev/null +++ b/abs.yaml @@ -0,0 +1,2 @@ +channels: + - https://staging.continuum.io/prefect/fs/gtest-feedstock/pr6/a70f57d \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 893a1a1..ca683eb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,11 @@ source: build: number: 0 +requirements: + build: + - patch # [unix] + - m2-patch # [win] + outputs: # default behaviour is shared; however note that upstream does not support # fully shared builds on windows, and some static libs will remain, see above @@ -57,13 +62,14 @@ outputs: # ensure that all dependent packages reflect that to # avoid the solver getting stuck in no-man's-land. - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] - + missing_dso_whitelist: # [s390x] + - '$RPATH/ld64.so.1' # [s390x] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - ninja + - ninja-base run_constrained: - libabseil-static ={{ version }}=cxx{{ cxx_standard }}* # make sure we don't co-install with old version of old package name @@ -74,7 +80,7 @@ outputs: requires: - {{ compiler('cxx') }} - cmake - - ninja + - ninja-base - pkg-config files: - cmake_test/ @@ -141,9 +147,9 @@ outputs: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - ninja + - ninja-base host: - - gtest + - gtest 1.14 - {{ pin_subpackage("libabseil", exact=True) }} run: - gtest @@ -153,7 +159,7 @@ outputs: requires: - {{ compiler('cxx') }} - cmake - - ninja + - ninja-base - pkg-config files: - cmake_test/