All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
To: meta-virtualization@lists.yoctoproject.org
Cc: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
Subject: [meta-virtualization][m-c-s][PATCH] mod-wsgi: move to 4.9.0
Date: Mon, 20 Dec 2021 11:27:06 -0800	[thread overview]
Message-ID: <20211220192706.4002841-1-jpuhlman@mvista.com> (raw)

Older version of mod-wsgi no longer builds against python 3.10

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 ...ow-PYTHON-values-to-be-passed-via-en.patch | 37 +++++++++----------
 .../recipes-support/mod-wsgi/mod-wsgi_git.bb  |  4 +-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
index 4683db0a..79aedffd 100644
--- a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
+++ b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
@@ -7,28 +7,31 @@ This allows the recipe to specify specific values instead of them
 being 'discovered' which may lead to host contamination or similar
 issues.
 
+Updated for 4.9.0: Jeremy Puhlman
+
 Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
+----
  configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 41 insertions(+)
 
+
 diff --git a/configure.ac b/configure.ac
-index 25afe44..b5a9e03 100644
+index 37a0f86..9b77c7f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -100,26 +100,38 @@ fi
+@@ -106,26 +106,38 @@ fi
  
  AC_SUBST(PYTHON)
  
 +if test -z "${PYTHON_VERSION}"; then
  PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("VERSION"))'`
 +fi
  
 +if test -z "${PYTHON_LDVERSION}"; then
  PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
 +fi
  
@@ -38,7 +41,7 @@ index 25afe44..b5a9e03 100644
  
 +if test -z "${PYTHON_INCLUDEPY}"; then
  CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
 +else
 +CPPFLAGS1="${PYTHON_INCLUDEPY}"
@@ -46,7 +49,7 @@ index 25afe44..b5a9e03 100644
  
 +if test -z "${PYTHON_CFLAGS}"; then
  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())))'`
 +else
@@ -55,13 +58,13 @@ index 25afe44..b5a9e03 100644
  
  if test "${ENABLE_EMBEDDED}" != "yes"; then
  CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
-@@ -131,22 +143,43 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
+@@ -137,22 +149,42 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
  
  AC_SUBST(CPPFLAGS)
  
 +if test -z "${PYTHON_LIBDIR}"; then
  PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("LIBDIR"))'`
 +else
 +PYTHONLIBDIR="${PYTHON_LIBDIR}"
@@ -76,22 +79,21 @@ index 25afe44..b5a9e03 100644
 +fi
 +if test -z "${PYTHON_FRAMEWORKDIR}"; then
  PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
 +else
 +PYTHONFRAMEWORKDIR="${PYTHON_FRAMEWORKDIR}"
 +fi
-+
 +if test -z "${PYTHON_FRAMEWORKPREFIX}"; then
  PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'`
 +else
 +PYTHONFRAMEWORKPREFIX="${PYTHON_FRAMEWORKPREFIX}"
 +fi
 +if test -z "${PYTHON_FRAMEWORK}"; then
  PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
 +else
 +PYTHONFRAMEWORK="${PYTHON_FRAMEWORK}"
@@ -99,20 +101,20 @@ index 25afe44..b5a9e03 100644
  
  if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
      PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}"
-@@ -170,12 +203,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+@@ -180,12 +212,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
          LDLIBS1="-lpython${PYTHON_VERSION}"
      fi
  
 +    if test -z "${PYTHON_LIBS}"; then
      LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
-         from distutils import sysconfig; \
+         import sysconfig; \
          stdout.write(sysconfig.get_config_var("LIBS"))'`
 +    else
 +    LDLIBS2="${PYTHON_LIBS}"
 +    fi
 +    if test -z "${PYTHON_SYSLIBS}"; then
      LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
-         from distutils import sysconfig; \
+         import sysconfig; \
          stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
 +    else
 +    LDLIBS3="${PYTHON_SYSLIBS}"
@@ -120,6 +122,3 @@ index 25afe44..b5a9e03 100644
  else
      LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
  
--- 
-2.7.4
-
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index 79afba81..910bba1b 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -9,8 +9,8 @@ HOMEPAGE = "https://github.com/GrahamDumpleton/mod_wsgi"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "217e80b7436035723b80ff02ee349365e8553dfc"
-PV = "4.6.8+git${SRCPV}"
+SRCREV = "df9faf954a1ab6208f45ba6fde90f0b41f605483"
+PV = "4.9.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
2.31.1



             reply	other threads:[~2021-12-20 19:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-20 19:27 Jeremy A. Puhlman [this message]
2021-12-21  1:52 ` [meta-virtualization][m-c-s][PATCH] mod-wsgi: move to 4.9.0 Bruce Ashfield

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=20211220192706.4002841-1-jpuhlman@mvista.com \
    --to=jpuhlman@mvista.com \
    --cc=meta-virtualization@lists.yoctoproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.