← Back to branch summary

~doko/python/pkg3.3-debian

« back to all changes in this revision

Viewing changes to patches/cross-build.diff

  • Committer: Matthias Klose
  • Date: 2013-01-26 15:27:56 UTC
  • Revision ID: doko@ubuntu.com-20130126152756-wnuhawmmrt8sz0x2
python3.3 (3.3.0-10) experimental; urgency=low

  * Update to 20130126 from the 3.3 branch.
  * Update hurd patches.
  * python3.3-dbg, libpython3.3-dbg: Drop dependency on python.
  * python3.3-dbg: Make gdb (not gdb-minimal) a recommendation.
  * Git rid of build-dependency on python.
  * Add site-packages in virtual environments created by pyvenv.
    Closes: #698777.

 -- Matthias Klose <doko@debian.org>  Sat, 26 Jan 2013 12:17:05 +0100

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/cross-build.diff
1
 
diff -r c97447e36665 Lib/plat-generic/regen
2
 
--- a/Lib/plat-generic/regen    Fri Jan 25 13:19:35 2013 +0100
3
 
+++ b/Lib/plat-generic/regen    Fri Jan 25 13:36:51 2013 +0100
4
 
@@ -1,3 +1,3 @@
5
 
 #! /bin/sh
6
 
 set -v
7
 
-python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
8
 
+eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" /usr/include/netinet/in.h
9
 
diff -r c97447e36665 Makefile.pre.in
10
 
--- a/Makefile.pre.in   Fri Jan 25 13:19:35 2013 +0100
11
 
+++ b/Makefile.pre.in   Fri Jan 25 13:36:51 2013 +0100
12
 
@@ -203,7 +203,8 @@
13
 
 
14
 
 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
15
 
 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
16
 
-HOST_GNU_TYPE=  @host@
17
 
+BUILD_GNU_TYPE=        @build@
18
 
+HOST_GNU_TYPE= @host@
19
 
 
20
 
 # The task to run while instrument when building the profile-opt target
21
 
 PROFILE_TASK=  $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
22
 
@@ -1123,6 +1124,12 @@
23
 
        export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
24
 
        export EXE; EXE="$(BUILDEXE)"; \
25
 
        if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
26
 
+       export PYTHON_FOR_BUILD; \
27
 
+       if [ "$(BUILD_GNU_TYPE)" = "$(HOST_GNU_TYPE)" ]; then \
28
 
+         PYTHON_FOR_BUILD="$(BUILDPYTHON)"; \
29
 
+       else \
30
 
+         PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
31
 
+       fi; \
32
 
        cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
33
 
 
34
 
 python-config: $(srcdir)/Misc/python-config.in
35
 
diff -r c97447e36665 configure.ac
36
 
--- a/configure.ac      Fri Jan 25 13:19:35 2013 +0100
37
 
+++ b/configure.ac      Fri Jan 25 13:36:51 2013 +0100
38
 
@@ -50,6 +50,8 @@
39
 
 AC_CONFIG_HEADER(pyconfig.h)
40
 
 
41
 
 AC_CANONICAL_HOST
42
 
+AC_SUBST(build)
43
 
+AC_SUBST(host)
44
 
 
45
 
 if test "$cross_compiling" = yes; then
46
 
     AC_MSG_CHECKING([for python interpreter for cross build])