From 4dd76702ef482eff9913b1a42bc525f33eb6faab Mon Sep 17 00:00:00 2001 From: mediocretech Date: Thu, 21 Dec 2023 17:00:39 -0500 Subject: [PATCH 01/10] recipe for the ninja python module --- recipes/ninja-python/meta.yaml | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 recipes/ninja-python/meta.yaml diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml new file mode 100644 index 0000000000000..e4711b790737c --- /dev/null +++ b/recipes/ninja-python/meta.yaml @@ -0,0 +1,43 @@ +{% set name = "ninja" %} +{% set version = "1.11.1.1" %} + +package: + name: {{ name|lower }}-python + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/ninja-{{ version }}.tar.gz + sha256: 9d793b08dd857e38d0b6ffe9e6b7145d7c485a42dcfea04905ca0cdb6017cc3c + +build: + noarch: python + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + host: + - python + - setuptools >=42 + - setuptools-scm + - scikit-build + - pip + run: + - python + +test: + imports: + - ninja + commands: + - pip check + requires: + - pip + +about: + home: https://github.com/scikit-build/ninja-python-distributions + summary: Ninja is a small build system with a focus on speed + license: Apache-2.0 + license_file: PLEASE_ADD_LICENSE_FILE + +extra: + recipe-maintainers: + - mediocretech From 686e2f734c234b05722ee90c30950ac8bbc21454 Mon Sep 17 00:00:00 2001 From: mediocretech Date: Thu, 21 Dec 2023 17:05:42 -0500 Subject: [PATCH 02/10] lint --- recipes/ninja-python/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index e4711b790737c..3cea80b6d9055 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -16,13 +16,13 @@ build: requirements: host: - - python + - python >=3.8 - setuptools >=42 - setuptools-scm - scikit-build - pip run: - - python + - python >=3.8 test: imports: From 8c8d64389895b522081d288b5da4be87a2a8ec42 Mon Sep 17 00:00:00 2001 From: mediocretech Date: Fri, 22 Dec 2023 08:02:25 -0500 Subject: [PATCH 03/10] build tools --- recipes/ninja-python/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index 3cea80b6d9055..ef88462907407 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -15,6 +15,11 @@ build: number: 0 requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ compiler('gxx') }} + - cmake host: - python >=3.8 - setuptools >=42 From cc4953c99e99af77ad080879d4df3dd56ab6ace7 Mon Sep 17 00:00:00 2001 From: mediocretech Date: Wed, 10 Jan 2024 11:09:14 -0500 Subject: [PATCH 04/10] working build for ninja-python --- recipes/ninja-python/meta.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index ef88462907407..91fb356741427 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -13,21 +13,28 @@ build: noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 + missing_dso_whitelist: + - "*/libstdc++.so.6" + - "*/libgcc_s.so.1" requirements: build: - {{ compiler('c') }} - - {{ compiler('cxx') }} - {{ compiler('gxx') }} + - make - cmake host: - - python >=3.8 + - {{ compiler('c') }} + - {{ compiler('gxx') }} + - make + - cmake + - python >=3.8,<3.12 - setuptools >=42 - setuptools-scm - scikit-build - pip run: - - python >=3.8 + - python >=3.8,<3.12 test: imports: @@ -41,7 +48,7 @@ about: home: https://github.com/scikit-build/ninja-python-distributions summary: Ninja is a small build system with a focus on speed license: Apache-2.0 - license_file: PLEASE_ADD_LICENSE_FILE + license_file: LICENSE_Apache_20 extra: recipe-maintainers: From 73c39d21796f40fafb2caa2e83dfec715dd6e5ad Mon Sep 17 00:00:00 2001 From: mediocretech Date: Wed, 10 Jan 2024 11:10:03 -0500 Subject: [PATCH 05/10] unlimited python --- .scripts/build_steps.sh | 2 +- recipes/ninja-python/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 60c56d180aa1f..61e7b43cf7e5d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -6,7 +6,7 @@ # benefit from the improvement. set -xeuo pipefail - +git config --global safe.directory '*' export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/staged-recipes}" source "${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh" diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index 91fb356741427..5d66ed86624dc 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -28,13 +28,13 @@ requirements: - {{ compiler('gxx') }} - make - cmake - - python >=3.8,<3.12 + - python >=3.8 - setuptools >=42 - setuptools-scm - scikit-build - pip run: - - python >=3.8,<3.12 + - python >=3.8 test: imports: From 1353dc24f37fc7f5d49c3dd445d11c5b05aa26f5 Mon Sep 17 00:00:00 2001 From: mediocretech Date: Wed, 10 Jan 2024 12:10:46 -0500 Subject: [PATCH 06/10] build confirmed for linux and osx --- recipes/ninja-python/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index 5d66ed86624dc..ecea4b76ab653 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -23,6 +23,11 @@ requirements: - {{ compiler('gxx') }} - make - cmake + - python >=3.8 + - setuptools >=42 + - setuptools-scm + - scikit-build + - pip host: - {{ compiler('c') }} - {{ compiler('gxx') }} From ad5864bd7dfa7d3708cda71f2ddc52c929f691e0 Mon Sep 17 00:00:00 2001 From: Adam G <62549436+mediocretech@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:11:31 -0500 Subject: [PATCH 07/10] Update build_steps.sh --- .scripts/build_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 61e7b43cf7e5d..60c56d180aa1f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -6,7 +6,7 @@ # benefit from the improvement. set -xeuo pipefail -git config --global safe.directory '*' + export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/staged-recipes}" source "${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh" From a897ae873e8c0f43a63701997ebdb6b605d15e2c Mon Sep 17 00:00:00 2001 From: mediocretech Date: Wed, 10 Jan 2024 12:27:39 -0500 Subject: [PATCH 08/10] cxx for cross platform --- .ci_support/osx64.yaml | 4 ++++ recipes/ninja-python/meta.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.ci_support/osx64.yaml b/.ci_support/osx64.yaml index a09f5d08dc5c3..dbdcb01c815ee 100644 --- a/.ci_support/osx64.yaml +++ b/.ci_support/osx64.yaml @@ -12,3 +12,7 @@ channel_sources: - conda-forge target_platform: - osx-64 + +CONDA_BUILD_SYSROOT: +- /opt/MacOSX10.9.sdk + diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index ecea4b76ab653..e28ea15ec0dba 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -20,7 +20,7 @@ build: requirements: build: - {{ compiler('c') }} - - {{ compiler('gxx') }} + - {{ compiler('cxx') }} - make - cmake - python >=3.8 @@ -30,7 +30,7 @@ requirements: - pip host: - {{ compiler('c') }} - - {{ compiler('gxx') }} + - {{ compiler('cxx') }} - make - cmake - python >=3.8 From 756c987aa7e477d3a3ce824837f25b074653b4ff Mon Sep 17 00:00:00 2001 From: mediocretech Date: Wed, 10 Jan 2024 12:45:03 -0500 Subject: [PATCH 09/10] overlink for osx --- recipes/ninja-python/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/ninja-python/meta.yaml b/recipes/ninja-python/meta.yaml index e28ea15ec0dba..477a0ef33fc0f 100644 --- a/recipes/ninja-python/meta.yaml +++ b/recipes/ninja-python/meta.yaml @@ -16,6 +16,7 @@ build: missing_dso_whitelist: - "*/libstdc++.so.6" - "*/libgcc_s.so.1" + - "*/libc++.1.dylib" requirements: build: From 3206fc717dc31f087a631a2e710fc035b9459d41 Mon Sep 17 00:00:00 2001 From: Adam G <62549436+mediocretech@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:07:54 -0500 Subject: [PATCH 10/10] Update osx64.yaml --- .ci_support/osx64.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ci_support/osx64.yaml b/.ci_support/osx64.yaml index dbdcb01c815ee..a09f5d08dc5c3 100644 --- a/.ci_support/osx64.yaml +++ b/.ci_support/osx64.yaml @@ -12,7 +12,3 @@ channel_sources: - conda-forge target_platform: - osx-64 - -CONDA_BUILD_SYSROOT: -- /opt/MacOSX10.9.sdk -