Skip to content

Commit

Permalink
feat: Add patch to remove gmake calls
Browse files Browse the repository at this point in the history
* gmake is still not available for unix builds of make?
  • Loading branch information
matthewfeickert committed May 13, 2024
1 parent ba31b8c commit 2640a82
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 0 deletions.
40 changes: 40 additions & 0 deletions recipe/0004-Patch-gmake-out-of-setup.py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From 9f33cb91e6ee3d8d875ce7f86d773b5248ab48f6 Mon Sep 17 00:00:00 2001
From: Matthew Feickert <matthew.feickert@cern.ch>
Date: Mon, 13 May 2024 01:05:00 -0500
Subject: [PATCH] Patch gmake out of setup.py

---
setup.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 72cb832..a962205 100644
--- a/setup.py
+++ b/setup.py
@@ -150,13 +150,9 @@ class FastJetInstall(setuptools.command.install.install):

shutil.copytree(OUTPUT, fastjetdir / "_fastjet_core", symlinks=True)

- make = "make"
- if sys.platform == "darwin":
- make = "gmake"
-
pythondir = pathlib.Path(
subprocess.check_output(
- f"""{make} -f Makefile --eval='print-pythondir:
+ """make -f Makefile --eval='print-pythondir:
\t@echo $(pythondir)
' print-pythondir""",
shell=True,
@@ -167,7 +163,7 @@ class FastJetInstall(setuptools.command.install.install):

pyexecdir = pathlib.Path(
subprocess.check_output(
- f"""{make} -f Makefile --eval='print-pyexecdir:
+ """make -f Makefile --eval='print-pyexecdir:
\t@echo $(pyexecdir)
' print-pyexecdir""",
shell=True,
--
2.34.1

3 changes: 3 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ source:
- 0001-Don-t-overwrite-external-CXXFLAGS-and-LDFLAGS.patch
- 0002-Patch-fastjet-contrib-Makefile.in.patch
- 0003-Patch-fastjet-core-autogen.sh.patch
# needed until gmake added to unix make builds
# c.f. https://github.com/conda-forge/make-feedstock/pull/24
- 0004-Patch-gmake-out-of-setup.py.patch

build:
number: 7
Expand Down

0 comments on commit 2640a82

Please sign in to comment.