changeset 54:5aedaf1eb939

Do not dynamically patch the build profile base "base.ini"; use the official WSGI_PROFILE_OVERRIDE mechanism instead. This makes the build more robust with regard to later versions and can easily be adjusted to configure all other values also. NOTE: The UWSGI_PROFILE_OVERRIDE needs quoted values. Otherwise they are missed by the SETENV/FAKEROOT chain.
author Franz Glasner <fzglas.hg@dom66.de>
date Sun, 10 Mar 2019 04:49:35 +0100
parents 3b6e789833d4
children 5c9750085a39
files uwsginl-plugin-lang-py3/Makefile uwsginl/Makefile
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/uwsginl-plugin-lang-py3/Makefile	Sun Mar 10 00:13:59 2019 +0100
+++ b/uwsginl-plugin-lang-py3/Makefile	Sun Mar 10 04:49:35 2019 +0100
@@ -27,7 +27,7 @@
 
 PLIST_FILES=	${PLUGIN_DIR}/${PLUGIN_FILENAME}
 
-MAKE_ENV+=	UWSGI_PROFILE_OVERRIDE=plugin_build_dir=${STAGEDIR}${PREFIX}/${PLUGIN_DIR};plugin_dir=${PREFIX}/${PLUGIN_DIR} PYTHON=${PYTHON_CMD}
+MAKE_ENV+=	UWSGI_PROFILE_OVERRIDE="plugin_build_dir=${STAGEDIR}${PREFIX}/${PLUGIN_DIR};plugin_dir=${PREFIX}/${PLUGIN_DIR}" PYTHON=${PYTHON_CMD}
 
 UWSGI_NAME=	uwsginl
 UWSGI_PATH=	${LOCALBASE}/bin/${UWSGI_NAME}
--- a/uwsginl/Makefile	Sun Mar 10 00:13:59 2019 +0100
+++ b/uwsginl/Makefile	Sun Mar 10 04:49:35 2019 +0100
@@ -20,7 +20,7 @@
 USES=		pkgconfig python:build
 USE_RC_SUBR=	uwsginl
 
-MAKE_ENV+=	CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_PROFILE=nolang.ini UWSGI_BIN_NAME=${PORTNAME} UWSGI_EMBED_PLUGINS=cgi,clock_realtime,echo,logpipe UWSGI_PROFILE_OVERRIDE=plugin_dir=${PREFIX}/${PLUGIN_DIR}
+MAKE_ENV+=	CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_PROFILE=nolang.ini UWSGI_BIN_NAME=${PORTNAME} UWSGI_EMBED_PLUGINS=cgi,clock_realtime,echo,logpipe UWSGI_PROFILE_OVERRIDE="plugin_dir=${PREFIX}/${PLUGIN_DIR};${EXTRA_PROFILE_OVERRIDE:S/ /;/gW}"
 
 USERS=		uwsgi
 GROUPS=		uwsgi
@@ -55,9 +55,8 @@
 
 PLUGIN_DIR=	lib/${PORTNAME}/plugins
 
-post-patch:
 .for bcvar in DEBUG JSON PCRE XML SSL
-	@${REINPLACE_CMD} -e '/^${bcvar:tl} =/ s|= .*|= ${BUILDCONF_${bcvar}:Ufalse}|' ${WRKSRC}/buildconf/base.ini
+EXTRA_PROFILE_OVERRIDE+=	${bcvar:tl}=${BUILDCONF_${bcvar}:Ufalse}
 .endfor
 
 do-configure: