-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add patch to remove gmake calls
* gmake is still not available for unix builds of make?
- Loading branch information
1 parent
ba31b8c
commit 2640a82
Showing
2 changed files
with
43 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters