From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mod_wsgi: update to 4.9.4, fixes build with Python 3.10
Date: Wed, 12 Oct 2022 20:57:40 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39917@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1281 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages mod-wsgi-4.9
https://github.com/void-linux/void-packages/pull/39917
mod_wsgi: update to 4.9.4, fixes build with Python 3.10
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
#39083
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39917.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mod-wsgi-4.9-39917.patch --]
[-- Type: text/x-diff, Size: 5781 bytes --]
From 1e010fcb9e1415922654a2bf91e6e25c6107426a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <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
pre_configure() {
next reply other threads:[~2022-10-12 18:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 18:57 paper42 [this message]
2022-10-12 19:27 ` [PR PATCH] [Updated] " paper42
2022-11-01 1:10 ` sgn
2022-11-18 7:13 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39917@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).