From c97b4fb16e9852358cb150e41e61647b1e1fe3c0 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 24 Jan 2022 17:11:11 -0500 Subject: [PATCH] fix: try without patch --- recipe/gh3577.patch | 23 ----------------------- recipe/meta.yaml | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 recipe/gh3577.patch diff --git a/recipe/gh3577.patch b/recipe/gh3577.patch deleted file mode 100644 index bfe2234..0000000 --- a/recipe/gh3577.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 407acfeba87b3b58d8e0493f5efff1bb4cee32bd Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Tue, 28 Dec 2021 14:32:29 -0500 -Subject: [PATCH] fix: support conda-forge - ---- - setup.py | 3 ++ - 1 file changed, 3 insertions(+) - -diff --git a/setup.py b/setup.py -index a2326287d8..2c44d25d8d 100644 ---- a/setup.py -+++ b/setup.py -@@ -146,6 +146,9 @@ def remove_output(*sources): - "-DBUILD_TESTING=OFF", - "-DPYBIND11_NOPYTHON=ON", - ] -+ if "CMAKE_ARGS" in os.environ: -+ fcommand = [c for c in os.environ["CMAKE_ARGS"].split() if "DCMAKE_INSTALL_PREFIX" not in c] -+ cmd += fcommand - cmake_opts = dict(cwd=DIR, stdout=sys.stdout, stderr=sys.stderr) - subprocess.check_call(cmd, **cmake_opts) - subprocess.check_call(["cmake", "--install", tmpdir], **cmake_opts) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b60bc3a..f0341c2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,8 +12,6 @@ source: fn: pybind11-{{ version }}.tar.gz url: https://github.com/pybind/pybind11/archive/v{{ version }}.tar.gz sha256: {{ sha256 }} - patches: - - gh3577.patch build: number: 0