[Python-modules-commits] r24435 - in packages/mod-wsgi/trunk/debian (5 files)

Sun May 19 10:45:11 UTC 2013

Date: Sunday, May 19, 2013 @ 10:45:09
  Author: fgeyer
Revision: 24435

* Fix building against python3.3. Thanks to Dmitrijs Ledkovs for the
  initial patch. (Closes: #692390)
  - Add python-config.patch to make configure.ac query pythonX.Y-config
    instead of python-distutils.

Added:
  packages/mod-wsgi/trunk/debian/patches/python-config.patch
  packages/mod-wsgi/trunk/debian/patches/series
Modified:
  packages/mod-wsgi/trunk/debian/changelog
  packages/mod-wsgi/trunk/debian/control
  packages/mod-wsgi/trunk/debian/rules

Modified: packages/mod-wsgi/trunk/debian/changelog
===================================================================

--- packages/mod-wsgi/trunk/debian/changelog	2013-05-19 10:27:49 UTC (rev 24434)
+++ packages/mod-wsgi/trunk/debian/changelog	2013-05-19 10:45:09 UTC (rev 24435)
@@ -1,7 +1,14 @@
 mod-wsgi (3.4-2) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
+  [ Felix Geyer ]
+  * Fix building against python3.3. Thanks to Dmitrijs Ledkovs for the
+    initial patch. (Closes: #692390)
+    - Add python-config.patch to make configure.ac query pythonX.Y-config
+      instead of python-distutils.
+
  -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:16 +0200
 
 mod-wsgi (3.4-1) experimental; urgency=low

Modified: packages/mod-wsgi/trunk/debian/control
===================================================================
--- packages/mod-wsgi/trunk/debian/control	2013-05-19 10:27:49 UTC (rev 24434)
+++ packages/mod-wsgi/trunk/debian/control	2013-05-19 10:45:09 UTC (rev 24435)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Piotr OÅ¼arowski <piotr at debian.org>
-Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, apache2-threaded-dev
+Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, apache2-threaded-dev, dh-autoreconf
 Homepage: http://www.modwsgi.org/
 Standards-Version: 3.9.2
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/mod-wsgi/trunk/

Added: packages/mod-wsgi/trunk/debian/patches/python-config.patch
===================================================================
--- packages/mod-wsgi/trunk/debian/patches/python-config.patch	                        (rev 0)
+++ packages/mod-wsgi/trunk/debian/patches/python-config.patch	2013-05-19 10:45:09 UTC (rev 24435)
@@ -0,0 +1,71 @@
+Description: Query pythonX.Y-config instead of python-distutils to fix building
+ against python3.3.
+Author: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
+Author: Felix Geyer <fgeyer at debian.org>
+Bug-Debian: http://bugs.debian.org/692390
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,14 +77,8 @@
+     from distutils import sysconfig; \
+     stdout.write((sysconfig.get_config_var("VERSION")))'`
+ 
+-CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
+-    from distutils import sysconfig; \
+-    stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
+-
+-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())))'`
++CPPFLAGS1=`${PYTHON}-config --includes`
++[CPPFLAGS2=`${PYTHON}-config --cflags | sed 's|^-[^D][^ ]*||g; s| -[^D][^ ]*||g; s|^ ||; s| *$||g'`]
+ 
+ if test "${ENABLE_EMBEDDED}" != "yes"; then
+ CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
+@@ -113,32 +106,8 @@
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
+ 
+-if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+-        "${ENABLE_FRAMEWORK}" != "yes"; then
+-    LDFLAGS1="-L${PYTHONLIBDIR}"
+-    LDFLAGS2="-L${PYTHONCFGDIR}"
+-
+-    LDLIBS1="-lpython${PYTHON_VERSION}"
+-    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}\", ''))"`
+-
+-    LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
+-        from distutils import sysconfig; \
+-        stdout.write(sysconfig.get_config_var("LIBS"))'`
+-fi
++[LDFLAGS1=`${PYTHON}-config --ldflags | sed 's|^-L[^ ]*||g; s| -L[^ ]*||g; s|^ ||; s| *$||g'`]
++[LDLIBS1=`${PYTHON}-config --ldflags | sed 's|^-l[^ ]*||g; s| -l[^ ]*||g; s|^ ||; s| *$||g'`]
+ 
+ CFLAGS1=""
+ for arg in ${CFLAGS}
+@@ -157,8 +125,8 @@
+ fi
+ 
+ CFLAGS="${CFLAGS1} ${CFLAGS2}"
+-LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
+-LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
++LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS3}"
++LDLIBS="${LDLIBS} ${LDLIBS1}"
+ 
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LDFLAGS)

Added: packages/mod-wsgi/trunk/debian/patches/series
===================================================================
--- packages/mod-wsgi/trunk/debian/patches/series	                        (rev 0)
+++ packages/mod-wsgi/trunk/debian/patches/series	2013-05-19 10:45:09 UTC (rev 24435)
@@ -0,0 +1 @@
+python-config.patch

Modified: packages/mod-wsgi/trunk/debian/rules
===================================================================
--- packages/mod-wsgi/trunk/debian/rules	2013-05-19 10:27:49 UTC (rev 24434)
+++ packages/mod-wsgi/trunk/debian/rules	2013-05-19 10:45:09 UTC (rev 24435)
@@ -16,6 +16,10 @@
 PY3MAX=$(shell echo $(PY3VERS) | LANG=C awk '{print $$NF+0.1}')
 pkgdir = $(CURDIR)/debian/$(PACKAGE)$(if $(patsubst 3.%,,$(1)),,-py3)
 
+autoreconf-stamp:
+	dh_autoreconf
+	touch $@
+
 build-%/config.status:
 	dh_testdir
 	mkdir -p build-$*
@@ -29,14 +33,16 @@
 	touch $@
 
 build: build-arch
-build-arch: $(PYVERS:%=build-%/build-stamp) $(PY3VERS:%=build-%/build-stamp)
+build-arch: autoreconf-stamp $(PYVERS:%=build-%/build-stamp) $(PY3VERS:%=build-%/build-stamp)
 build-indep:
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -rf build-*
-	dh_clean 
+	dh_autoreconf_clean
+	dh_clean
+	rm -f autoreconf-stamp
 
 install-clean:
 	dh_testdir


