mod_wsgi: update to 4.9.4.

Close: #39917
This commit is contained in:
Michal Vasilek 2022-10-12 21:05:13 +02:00 committed by Đoàn Trần Công Danh
parent 00faa9583f
commit 36f1862d26
3 changed files with 39 additions and 40 deletions

View file

@ -1,9 +0,0 @@
To enable ${PKGNAME} in the Apache HTTP server, add the following line
into /etc/httpd/httpd.conf:
LoadModule wsgi_module modules/mod_wsgi.so
and reload the Apache daemon with:
# sv restart apache

View file

@ -1,23 +1,26 @@
diff --git configure.ac configure.ac
index 63d1bbc..543ecc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,26 +100,25 @@ fi
@@ -106,26 +106,24 @@
AC_SUBST(PYTHON)
-PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
+if test x"${PYTHON_VERSION}" = x""; then
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
from distutils import sysconfig; \
stdout.write(sysconfig.get_config_var("VERSION"))'`
+fi
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("VERSION"))'`
-
-PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
+if test x"${PYTHON_VERSION}" = x""; then
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
+ import sysconfig; \
+ stdout.write(sysconfig.get_config_var("VERSION"))'`
+fi
+
+if test x"${PYTHON_LDVERSION}" = x""; then
+ PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
from distutils import sysconfig; \
stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
+ PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
+ import sysconfig; \
+ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
+fi
if test x"${PYTHON_LDVERSION}" = x""; then
@ -25,37 +28,37 @@ index 63d1bbc..543ecc0 100644
fi
-CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
+CPPFLAGS1=$($PYTHON-config --includes)
-
-CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \
- sysconfig.get_config_var("CFLAGS").split())))'`
+CPPFLAGS1=$($PYTHON-config --includes)
+CPPFLAGS2=$($PYTHON-config --cflags | tr ' \t' '\n\n' | grep '^-D' | tr '\n' ' ')
if test "${ENABLE_EMBEDDED}" != "yes"; then
CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
@@ -131,66 +130,7 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
@@ -137,70 +135,7 @@
AC_SUBST(CPPFLAGS)
-PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("LIBDIR"))'`
-PYTHONCFGDIR=`${PYTHON} -c 'from sys import stdout; \
- import distutils.sysconfig; \
- stdout.write(distutils.sysconfig.get_python_lib(plat_specific=1, \
- standard_lib=1) +"/config")'`
-PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
-PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'`
-PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
-
-if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
@ -64,8 +67,12 @@ index 63d1bbc..543ecc0 100644
-
-if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
- "${ENABLE_FRAMEWORK}" != "yes"; then
- LDFLAGS1="-L${PYTHONLIBDIR}"
- LDFLAGS2="-L${PYTHONCFGDIR}"
- if test "${PYTHONLIBDIR}" != "${APXS_LIBDIR}" ; then
- LDFLAGS1="-L${PYTHONLIBDIR}"
- fi
- if test "${PYTHONCFGDIR}" != "${APXS_LIBDIR}" ; then
- LDFLAGS2="-L${PYTHONCFGDIR}"
- fi
-
- LDLIBS1="-lpython${PYTHON_LDVERSION}"
-
@ -81,10 +88,10 @@ index 63d1bbc..543ecc0 100644
- fi
-
- LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("LIBS"))'`
- LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
-else
- LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
@ -92,13 +99,13 @@ index 63d1bbc..543ecc0 100644
- VERSION="${PYTHON_VERSION}"
- STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
- LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var(
- \"LINKFORSHARED\").replace(\"${STRING}\", ''))" | \
- sed -e 's/-Wl,-stack_size,[[0-9]]*//'`
-
- LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
- import sysconfig; \
- stdout.write(sysconfig.get_config_var("LIBS"))'`
-fi
+PYTHONLIBDIR=$($PYTHON-config --ldflags)

View file

@ -1,18 +1,19 @@
# Template file for 'mod_wsgi'
pkgname=mod_wsgi
version=4.7.1
version=4.9.4
revision=1
build_style=gnu-configure
hostmakedepends="python3 perl automake libtool"
hostmakedepends="python3 perl automake libtool apache-devel"
makedepends="apache-devel python3-devel apr-devel"
short_desc="Python WSGI adapter module for Apache"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://modwsgi.readthedocs.io/en/develop/"
changelog="https://modwsgi.readthedocs.io/en/latest/release-notes/version-${version}.html"
distfiles="https://github.com/GrahamDumpleton/${pkgname}/archive/${version}.tar.gz"
checksum=2674e506719afe60fbc0547c832e8948d6caa2e054d40d336309993e6e867d35
distfiles="https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"
checksum=ee926a3fd5675890b908ebc23db1f8f7f03dc3459241abdcf35d46c68e1be29b
lib32disabled=yes
LDFLAGS=-lpython3
pre_configure() {
if [ "$CROSS_BUILD" ]; then