diff --git a/arbor-0.9.0-pybind11-3.0.patch b/arbor-0.9.0-pybind11-3.0.patch new file mode 100644 index 0000000..6fc58db --- /dev/null +++ b/arbor-0.9.0-pybind11-3.0.patch @@ -0,0 +1,22 @@ +diff -Naur arbor-0.9.0-original/python/pyarb.hpp arbor-0.9.0/python/pyarb.hpp +--- arbor-0.9.0-original/python/pyarb.hpp 2023-08-10 10:47:38.000000000 +0100 ++++ arbor-0.9.0/python/pyarb.hpp 2025-11-03 08:24:00.093256311 +0000 +@@ -13,18 +13,6 @@ + + #include + +-// Version check +-#define mk_tok(x) #x +-#define mk_ver(M, m, p) mk_tok(M) "." mk_tok(m) "." mk_tok(p) +-#define PB11_ERR(M, m, p) "Required version of pybind11 is 2.8.1 <= version < 3.0.0 Found " mk_ver(M, m, p) +-static_assert((PYBIND11_VERSION_HEX >= 0x02080100) +- && +- (PYBIND11_VERSION_HEX < 0x03000000), +- PB11_ERR(PYBIND11_VERSION_MAJOR, PYBIND11_VERSION_MINOR, PYBIND11_VERSION_PATCH)); +-#undef PB11_ERR +-#undef mk_ver +-#undef mk_tok +- + namespace pyarb { + + // Sample recorder object interface. diff --git a/arbor.spec b/arbor.spec index ebd3875..8e76de4 100644 --- a/arbor.spec +++ b/arbor.spec @@ -49,6 +49,9 @@ Patch: fix-missing-includes.patch # These were eventually included in # 76120d16c00ae67128c3c69421ab712f985f3445, along with many other changes. Patch: 0001-Fix-a-few-typos-that-cause-failure-to-compile-with-G.patch +# Remove the hard-coded pybind11 version check so that we can build with +# pybind11 3.0; this is part of https://github.com/arbor-sim/arbor/pull/2481. +Patch: arbor-0.9.0-pybind11-3.0.patch # Random123 does not support: # mips64r2 mips32r2 s390