# HG changeset patch # User Franz Glasner # Date 1666101717 -7200 # Node ID 5a9516babd5e54bff47910d5f1e74b5700bde4b4 # Parent 6d59435380434daa6d3d39ad42f4e36333b3b097 Renaming of the exported plugins descriptions data structure is not needed. Only one plugins with "rpython_startup_code" can exist on one process. So there are no name clashes possible. diff -r 6d5943538043 -r 5a9516babd5e uwsginl-plugin-lang-pypy3/Makefile --- a/uwsginl-plugin-lang-pypy3/Makefile Thu Oct 13 11:39:24 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/Makefile Tue Oct 18 16:01:57 2022 +0200 @@ -69,11 +69,6 @@ # 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} diff -r 6d5943538043 -r 5a9516babd5e uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c --- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Thu Oct 13 11:39:24 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Tue Oct 18 16:01:57 2022 +0200 @@ -33,7 +33,7 @@ extern struct uwsgi_server uwsgi; -struct uwsgi_plugin pypy_plugin; -+struct uwsgi_plugin CONCAT(PYPY_PLUGIN_NAME, _plugin); ++struct uwsgi_plugin pypy3_plugin; static int uwsgi_pypy_init() { @@ -152,7 +152,7 @@ -struct uwsgi_plugin pypy_plugin = { - .name = "pypy", -+struct uwsgi_plugin CONCAT(PYPY_PLUGIN_NAME, _plugin) = { ++struct uwsgi_plugin pypy3_plugin = { + .name = STR(PYPY_PLUGIN_NAME), .modifier1 = 0, .on_load = uwsgi_pypy_onload,