Mercurial > hgrepos > FreeBSD > ports > www > uwsginl
changeset 162:620a0992bf93
FIX: The exported symbol from a plugin really needs to match the name of the plugin
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Wed, 19 Oct 2022 02:34:51 +0200 |
| parents | 31cd6efe7e57 |
| children | 9b279d675487 |
| files | uwsginl-plugin-lang-pypy3/Makefile uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/uwsginl-plugin-lang-pypy3/Makefile Tue Oct 18 17:55:56 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/Makefile Wed Oct 19 02:34:51 2022 +0200 @@ -69,6 +69,11 @@ # Use the PATCHDIR of the binary executable by default PATCHDIR?= ${.CURDIR}/../uwsginl/files +.if ${PLUGIN_NAME} != pypy3 && ${PLUGIN_NAME} != pypy38 +post-patch: + ${REINPLACE_CMD} -i '' -e 's/pypy3_plugin/${PLUGIN_NAME}_plugin/g' ${WRKSRC}/${PLUGIN_SOURCE}/pypy_setup.py +.endif + do-configure: @${DO_NADA}
--- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Tue Oct 18 17:55:56 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Wed Oct 19 02:34:51 2022 +0200 @@ -33,7 +33,7 @@ extern struct uwsgi_server uwsgi; -struct uwsgi_plugin pypy_plugin; -+struct uwsgi_plugin pypy3_plugin; ++struct uwsgi_plugin CONCAT(PYPY_PLUGIN_NAME, _plugin); static int uwsgi_pypy_init() { @@ -152,7 +152,7 @@ -struct uwsgi_plugin pypy_plugin = { - .name = "pypy", -+struct uwsgi_plugin pypy3_plugin = { ++struct uwsgi_plugin CONCAT(PYPY_PLUGIN_NAME, _plugin) = { + .name = STR(PYPY_PLUGIN_NAME), .modifier1 = 0, .on_load = uwsgi_pypy_onload,