From 1e010fcb9e1415922654a2bf91e6e25c6107426a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 12 Oct 2022 20:53:19 +0200 Subject: [PATCH] mod_wsgi: update to 4.9.4. --- srcpkgs/mod_wsgi/patches/cross-python.patch | 107 -------------------- srcpkgs/mod_wsgi/template | 6 +- 2 files changed, 3 insertions(+), 110 deletions(-) delete mode 100644 srcpkgs/mod_wsgi/patches/cross-python.patch diff --git a/srcpkgs/mod_wsgi/patches/cross-python.patch b/srcpkgs/mod_wsgi/patches/cross-python.patch deleted file mode 100644 index eea650fcb15d..000000000000 --- a/srcpkgs/mod_wsgi/patches/cross-python.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git configure.ac configure.ac -index 63d1bbc..543ecc0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,26 +100,25 @@ fi - - 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 - --PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ -+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 "")'` -+fi - - if test x"${PYTHON_LDVERSION}" = x""; then - PYTHON_LDVERSION=${PYTHON_VERSION} - fi - --CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ -- from distutils 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; \ -- stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \ -- sysconfig.get_config_var("CFLAGS").split())))'` -+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}" - - AC_SUBST(CPPFLAGS) - --PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \ -- from distutils 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; \ -- stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'` --PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \ -- from distutils import sysconfig; \ -- stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'` --PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \ -- from distutils import sysconfig; \ -- stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` -- --if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then -- PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" --fi -- --if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ -- "${ENABLE_FRAMEWORK}" != "yes"; then -- LDFLAGS1="-L${PYTHONLIBDIR}" -- LDFLAGS2="-L${PYTHONCFGDIR}" -- -- LDLIBS1="-lpython${PYTHON_LDVERSION}" -- -- # MacOS X seems to be broken and doesn't use ABIFLAGS suffix -- # so add a check to try and work out what we need to do. -- -- if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then -- LDLIBS1="-lpython${PYTHON_VERSION}" -- fi -- -- if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then -- LDLIBS1="-lpython${PYTHON_VERSION}" -- fi -- -- LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ -- from distutils import sysconfig; \ -- stdout.write(sysconfig.get_config_var("LIBS"))'` -- LDLIBS3=`${PYTHON} -c 'from sys import stdout; \ -- from distutils import sysconfig; \ -- stdout.write(sysconfig.get_config_var("SYSLIBS"))'` --else -- LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}" -- -- VERSION="${PYTHON_VERSION}" -- STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}" -- LDFLAGS2=`${PYTHON} -c "from sys import stdout; \ -- from distutils 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; \ -- stdout.write(sysconfig.get_config_var("LIBS"))'` --fi -+PYTHONLIBDIR=$($PYTHON-config --ldflags) - - CFLAGS1="" - for arg in ${CFLAGS} diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template index 28872edf8d52..0cb0a7cf6453 100644 --- a/srcpkgs/mod_wsgi/template +++ b/srcpkgs/mod_wsgi/template @@ -1,6 +1,6 @@ # 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" @@ -10,8 +10,8 @@ maintainer="Orphaned " 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 pre_configure() {