Merge branch 'main' into dask_fastjet

MANIFEST.in

@@ -4,5 +4,5 @@ graft fastjet-core
 graft fastjet-contrib
 graft pybind11
 global-exclude .git .gitmodules
-include LICENSE README.md pyproject.toml setup.py setup.cfg patch_fastjet_i.txt patch_clustersequence.txt
+include LICENSE README.md pyproject.toml setup.py setup.cfg patch_fastjet_i.txt patch_clustersequence.txt patch_makefilein.txt
 exclude .cirrus.yml

patch_makefilein.txt

@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index a4645fd..a7b82e2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -8,11 +8,6 @@
+ SUBDIRS=@CONTRIB_BUILD_LIST@
+ SUBDIRS.all=$(SUBDIRS:=.all)
+
+-# these will be overriden if the user specifies CXX or CXXFLAGS with configure
+-# they will also be overriden by definitions in subsiduary Makefiles
+-CXX=g++
+-CXXFLAGS=-O2 -Wall -g
+-
+ # get any variables defined in the contrib-wide include
+ -include .Makefile.inc

setup.py

@@ -110,6 +110,13 @@ def build_extensions(self):
             subprocess.run(["make", "-j"], cwd=FASTJET, env=env, check=True)
             subprocess.run(["make", "install"], cwd=FASTJET, env=env, check=True)
 
+            subprocess.run(
+                ["patch", "./Makefile.in", DIR / "patch_makefilein.txt"],
+                cwd=FASTJET_CONTRIB,
+                env=env,
+                check=True,
+            )
+
             subprocess.run(
                 [
                     "./configure",