ports/183353: [patch] www/mod_wsgi3 doesn' t build under python3

[Douglas Thrift]

The following reply was made to PR ports/183353; it has been noted by GNATS.

From: Douglas Thrift <douglas at douglasthrift.net>
To: bug-followup at FreeBSD.org, trevor at bitba.se
Cc:  
Subject: Re: ports/183353: [patch] www/mod_wsgi3 doesn't build under python3
Date: Sun, 24 Nov 2013 14:06:19 -0800

 This is a multi-part message in MIME format.
 --------------020301080900070505090403
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 I've remade the patch now that ports/184065 has been committed. I'm
 hoping a committer can get to this soon.
 -- 
 Douglas William Thrift
 <douglas at douglasthrift.net>
 <http://douglasthrift.net/>
 
 --------------020301080900070505090403
 Content-Type: text/plain; charset=windows-1252;
  name="mod_wsgi3.2013-11-24T215907Z.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mod_wsgi3.2013-11-24T215907Z.diff"
 
 diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/patch-configure mod_wsgi3/files/patch-configure
 --- /usr/ports/www/mod_wsgi3/files/patch-configure	1969-12-31 16:00:00.000000000 -0800
 +++ mod_wsgi3/files/patch-configure	2013-11-10 13:50:28.000000000 -0800
 @@ -0,0 +1,49 @@
 +--- configure.orig	Thu Oct 18 21:12:46 2012 +1100
 ++++ configure		Thu Oct 18 21:14:28 2012 +1100
 +@@ -1785,7 +1785,15 @@
 + 
 + PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
 +     from distutils import sysconfig; \
 +-    stdout.write((sysconfig.get_config_var("VERSION")))'`
 ++    stdout.write(sysconfig.get_config_var("VERSION"))'`
 ++
 ++PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
 ++    from distutils import sysconfig; \
 ++    stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
 ++
 ++if test x"${PYTHON_LDVERSION}" = x""; then
 ++    PYTHON_LDVERSION=${PYTHON_VERSION}
 ++fi
 + 
 + CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
 +     from distutils import sysconfig; \
 +@@ -1823,12 +1831,28 @@
 +     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_VERSION}"
 ++    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"))'`
 diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/patch-configure.ac mod_wsgi3/files/patch-configure.ac
 --- /usr/ports/www/mod_wsgi3/files/patch-configure.ac	1969-12-31 16:00:00.000000000 -0800
 +++ mod_wsgi3/files/patch-configure.ac	2013-11-10 13:50:28.000000000 -0800
 @@ -0,0 +1,50 @@
 +--- configure.ac.orig	Thu Oct 18 21:12:46 2012 +1100
 ++++ configure.ac	Thu Oct 18 21:14:28 2012 +1100
 +@@ -75,7 +75,15 @@
 + 
 + PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
 +     from distutils import sysconfig; \
 +-    stdout.write((sysconfig.get_config_var("VERSION")))'`
 ++    stdout.write(sysconfig.get_config_var("VERSION"))'`
 ++
 ++PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
 ++    from distutils import sysconfig; \
 ++    stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
 ++
 ++if test x"${PYTHON_LDVERSION}" = x""; then
 ++    PYTHON_LDVERSION=${PYTHON_VERSION}
 ++fi
 + 
 + CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
 +     from distutils import sysconfig; \
 +@@ -113,12 +121,28 @@
 +     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_VERSION}"
 ++    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"))'`
 +
 
 --------------020301080900070505090403--