Mercurial > hgrepos > FreeBSD > ports > www > uwsginl

changeset 90:3e92a10a2c96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For the PyPy3-plugin: use the proper shared library name for FreeBSD: libpypy3-co.so. This is an "EXTRA_PATCHES" for PyPy3.
author Franz Glasner <f.glasner@feldmann-mg.com>
date Mon, 15 Jun 2020 12:34:20 +0200
parents 40e8d1ee1651
children aacfdd48b76a
files uwsginl-plugin-lang-pypy3/Makefile uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c
diffstat 2 files changed, 49 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/uwsginl-plugin-lang-pypy3/Makefile	Mon Jun 15 12:13:22 2020 +0200
+++ b/uwsginl-plugin-lang-pypy3/Makefile	Mon Jun 15 12:34:20 2020 +0200
@@ -26,6 +26,8 @@
 
 .include        "${.CURDIR}/../uwsginl/Makefile.gh"
 
+EXTRA_PATCHES=	${.CURDIR}/files/extra
+
 PLIST_FILES=	${PLUGIN_DIR}/${PLUGIN_FILENAME}
 
 MAKE_ENV+=	UWSGI_PROFILE_OVERRIDE="plugin_build_dir=${STAGEDIR}${PREFIX}/${PLUGIN_DIR};plugin_dir=${PREFIX}/${PLUGIN_DIR}" PYTHON=/usr/local/bin/pypy3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c	Mon Jun 15 12:34:20 2020 +0200
@@ -0,0 +1,47 @@
+--- plugins/pypy/pypy_plugin.c.orig	2020-06-15 10:24:33 UTC
++++ plugins/pypy/pypy_plugin.c
+@@ -68,11 +68,11 @@ static int uwsgi_pypy_init() {
+ 		if (upypy.home) {
+ 			// first try with /bin way:
+ #ifdef __CYGWIN__
+-                        char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy-c.dll");
++                        char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy3-c.so");
+ #elif defined(__APPLE__)
+-                        char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy-c.dylib");
++                        char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy3-c.so");
+ #else
+-                        char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy-c.so");
++                        char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy3-c.so");
+ #endif
+ 			if (uwsgi_file_exists(libpath)) {
+                                 upypy.handler = dlopen(libpath, RTLD_NOW | RTLD_GLOBAL);
+@@ -83,11 +83,11 @@ static int uwsgi_pypy_init() {
+ 			if (!upypy.handler) {
+ 			
+ #ifdef __CYGWIN__
+-                        	char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dll");
++                        	char *libpath = uwsgi_concat2(upypy.home, "/libpypy3-c.so");
+ #elif defined(__APPLE__)
+-                        	char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dylib");
++                        	char *libpath = uwsgi_concat2(upypy.home, "/libpypy3-c.dylib");
+ #else
+-                        	char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.so");
++                        	char *libpath = uwsgi_concat2(upypy.home, "/libpypy3-c.so");
+ #endif
+ 				if (uwsgi_file_exists(libpath)) {
+ 					upypy.handler = dlopen(libpath, RTLD_NOW | RTLD_GLOBAL);
+@@ -98,11 +98,11 @@ static int uwsgi_pypy_init() {
+ 		// fallback to standard library search path
+ 		if (!upypy.handler) {
+ #ifdef __CYGWIN__
+-			upypy.handler = dlopen("libpypy-c.dll", RTLD_NOW | RTLD_GLOBAL);
++			upypy.handler = dlopen("libpypy3-c.dll", RTLD_NOW | RTLD_GLOBAL);
+ #elif defined(__APPLE__)
+-			upypy.handler = dlopen("libpypy-c.dylib", RTLD_NOW | RTLD_GLOBAL);
++			upypy.handler = dlopen("libpypy3-c.dylib", RTLD_NOW | RTLD_GLOBAL);
+ #else
+-			upypy.handler = dlopen("libpypy-c.so", RTLD_NOW | RTLD_GLOBAL);
++			upypy.handler = dlopen("libpypy3-c.so", RTLD_NOW | RTLD_GLOBAL);
+ #endif
+ 		}
+ 	}