← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mod-wsgi/saucy-updates

« back to all changes in this revision

Viewing changes to debian/patches/python-config.patch

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2012-10-23 16:00:24 UTC
  • Revision ID: package-import@ubuntu.com-20121023160024-s71bcwhj423kgnep
Tags: 3.4-0ubuntu2
Patch configure.ac to build against pythonX.Y-config. This builds
python3.3 module, but default module symlink still points to 3.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/python-config.patch
 
1
Index: b/configure.ac
 
2
===================================================================
 
3
--- a/configure.ac
 
4
+++ b/configure.ac
 
5
@@ -77,14 +77,7 @@
 
6
     from distutils import sysconfig; \
 
7
     stdout.write((sysconfig.get_config_var("VERSION")))'`
 
8
 
 
9
-CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
 
10
-    from distutils import sysconfig; \
 
11
-    stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
 
12
-
 
13
-CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \
 
14
-    from distutils import sysconfig; \
 
15
-    stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \
 
16
-    sysconfig.get_config_var("CFLAGS").split())))'`
 
17
+CPPFLAGS1=`${PYTHON}-config --includes`
 
18
 
 
19
 if test "${ENABLE_EMBEDDED}" != "yes"; then
 
20
 CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
 
21
@@ -92,7 +85,7 @@
 
22
 CPPFLAGS3=""
 
23
 fi
 
24
 
 
25
-CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
 
26
+CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS3}"
 
27
 
 
28
 AC_SUBST(CPPFLAGS)
 
29
 
 
30
@@ -113,32 +106,7 @@
 
31
     from distutils import sysconfig; \
 
32
     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
 
33
 
 
34
-if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
 
35
-        "${ENABLE_FRAMEWORK}" != "yes"; then
 
36
-    LDFLAGS1="-L${PYTHONLIBDIR}"
 
37
-    LDFLAGS2="-L${PYTHONCFGDIR}"
 
38
-
 
39
-    LDLIBS1="-lpython${PYTHON_VERSION}"
 
40
-    LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
 
41
-        from distutils import sysconfig; \
 
42
-        stdout.write(sysconfig.get_config_var("LIBS"))'`
 
43
-    LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
 
44
-        from distutils import sysconfig; \
 
45
-        stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
 
46
-else
 
47
-    LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
 
48
-
 
49
-    VERSION="${PYTHON_VERSION}"
 
50
-    STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
 
51
-    LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
 
52
-        from distutils import sysconfig; \
 
53
-        stdout.write(sysconfig.get_config_var(
 
54
-        \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
 
55
-
 
56
-    LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
 
57
-        from distutils import sysconfig; \
 
58
-        stdout.write(sysconfig.get_config_var("LIBS"))'`
 
59
-fi
 
60
+LDFLAGS1=`${PYTHON}-config --ldflags`
 
61
 
 
62
 CFLAGS1=""
 
63
 for arg in ${CFLAGS}
 
64
@@ -157,8 +125,8 @@
 
65
 fi
 
66
 
 
67
 CFLAGS="${CFLAGS1} ${CFLAGS2}"
 
68
-LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 
69
-LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
70
+LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS3}"
 
71
+LDLIBS="${LDLIBS}"
 
72
 
 
73
 AC_SUBST(CFLAGS)
 
74
 AC_SUBST(LDFLAGS)