Skip to content

Fix signatures for function pointers passed through __Pyx_IsSameCFunction #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 30, 2025
Merged

Fix signatures for function pointers passed through __Pyx_IsSameCFunction #213

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f59d7e5
Fix `__Pyx_IsSameCFunction` cast
agriyakhetarpal Jun 29, 2025
f98e8c6
Port #168 in this branch, temporarily
agriyakhetarpal Jun 29, 2025
d91610b
Merge branch 'main' into updates-for-scipy
agriyakhetarpal Jun 30, 2025
9c803e9
Add comment about SciPy 1.16 build problem
agriyakhetarpal Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pyodide_build/_f2c_fixes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@ def scipy_fix_cfile(path: Path) -> None:
text = text.replace("void(*)", "int(*)")
text = text.replace("static void f2py_setup_", "static int f2py_setup_")

# Fix Cython-generated function pointer casts for __Pyx_IsSameCFunction
# for _matfuncs_sqrtm for builds of SciPy 1.16.0.
# TODO: I'm not sure if this is the best place to put this, but it works
text = re.sub(
r"(__Pyx_IsSameCFunction\([^,]+,\s*)\(int\(\*\)\(void\)\)",
r"\1(void(*)(void))",
text,
)

if path.name.endswith("_flapackmodule.c"):
text = text.replace(",size_t", "")
text = re.sub(r",slen\([a-z]*\)\)", ")", text)
Expand Down