Attachment 137696 Details for Bug 183353 – mod_wsgi3.2013-10-28T183938Z.diff

[patch] mod_wsgi3.2013-10-28T183938Z.diff

mod_wsgi3.2013-10-28T183938Z.diff (text/x-diff), 4.55 KB, created by douglas.thrift on 2013-10-28 19:50:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: douglas.thrift

Created: 2013-10-28 19:50:46 UTC

Size: 4.55 KB

patch

obsolete

>diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/Makefile mod_wsgi3/Makefile
>--- /usr/ports/www/mod_wsgi3/Makefile	2013-09-20 16:36:50.000000000 -0700
>+++ mod_wsgi3/Makefile	2013-10-28 11:19:42.000000000 -0700
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	mod_wsgi
> PORTVERSION=	3.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	GOOGLE_CODE
> PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
>@@ -25,7 +25,6 @@
> 
> SUB_FILES=	pkg-message
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> .if ${PYTHON_REL} >= 300 && ${PYTHON_REL} < 310
>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-10-28 11:17:45.644919745 -0700
>@@ -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-10-28 11:17:45.654936940 -0700
>@@ -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"))'`
>+

Actions: View | Diff

Attachments on bug 183353: 137695 | 137696 | 137697