← Back to branch summary

~ubuntu-branches/ubuntu/saucy/python2.7/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/cross-build.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-01-26 15:58:08 UTC
  • Revision ID: package-import@ubuntu.com-20130126155808-ej97ewsp21txdk9d
Tags: 2.7.3-15ubuntu2
* Update to 20130126, taken from the 2.7 branch.
  - Issue #10156: In the interpreter's initialization phase, unicode globals
    are now initialized dynamically as needed.
  - Issue #16975: Fix error handling bug in the escape-decode decoder.
  - Issue #9290: In IDLE the sys.std* streams now implement io.TextIOBase
    interface and support all mandatory methods and properties.
  - Issue #13454: Fix a crash when deleting an iterator created by
    itertools.tee() if all other iterators were very advanced before.
  - Issue #3754: fix typo in pthread AC_CACHE_VAL.
  - Issue #17029: Let h2py search the multiarch system include directory.
* python2.7-dbg, libpython2.7-dbg: Drop dependency on python.
* python2.7-dbg: Make gdb (not gdb-minimal) a recommendation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/cross-build.diff
84
84
 
85
85
 CC=            @CC@
86
86
 CXX=           @CXX@
87
 
@@ -198,6 +200,10 @@
 
87
@@ -201,6 +203,10 @@
88
88
 PYTHON=                python$(EXE)
89
89
 BUILDPYTHON=   python$(BUILDEXE)
90
90
 
95
95
 # The task to run while instrument when building the profile-opt target
96
96
 PROFILE_TASK=  $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
97
97
 #PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py
98
 
@@ -230,6 +236,19 @@
 
98
@@ -233,6 +239,19 @@
99
99
 # Parser
100
100
 PGEN=          Parser/pgen$(EXE)
101
101
 
115
115
 POBJS=         \
116
116
                Parser/acceler.o \
117
117
                Parser/grammar1.o \
118
 
@@ -245,6 +264,14 @@
 
118
@@ -248,6 +267,14 @@
119
119
 
120
120
 PARSER_OBJS=   $(POBJS) Parser/myreadline.o Parser/tokenizer.o
121
121
 
130
130
 PGOBJS=                \
131
131
                Objects/obmalloc.o \
132
132
                Python/mysnprintf.o \
133
 
@@ -257,7 +284,8 @@
 
133
@@ -260,7 +287,8 @@
134
134
                Parser/parser.h \
135
135
                Parser/tokenizer.h
136
136
 
140
140
 
141
141
 ##########################################################################
142
142
 # AST
143
 
@@ -399,6 +427,7 @@
 
143
@@ -402,6 +430,7 @@
144
144
        $(MAKE) all PY_CFLAGS="$(PY_CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
145
145
 
146
146
 run_profile_task:
148
148
        -./$(BUILDPYTHON) $(PROFILE_TASK)
149
149
 
150
150
 build_all_use_profile:
151
 
@@ -418,12 +447,12 @@
 
151
@@ -421,12 +450,12 @@
152
152
                        -Wl,--whole-archive $(BLDLIBRARY) -Wl,--no-whole-archive $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
153
153
 
154
154
 platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
164
164
        mkdir -p `cat pybuilddir.txt`
165
165
        cp $(SYSCONFIGDATA) `cat pybuilddir.txt`/.
166
166
 
167
 
@@ -436,8 +465,9 @@
 
167
@@ -439,8 +468,9 @@
168
168
            *\ -s*|s*) quiet="-q";; \
169
169
            *) quiet="";; \
170
170
        esac; \
175
175
 
176
176
 # Build static library
177
177
 # avoid long command lines, same as LIBRARY_OBJS
178
 
@@ -570,12 +600,13 @@
 
178
@@ -573,12 +603,13 @@
179
179
                $(if $(MULTIARCH),-DMULTIARCH='"$(MULTIARCH)"') \
180
180
                -o $@ $(srcdir)/Python/dynload_shlib.c
181
181
 
194
194
 
195
195
 $(PGEN):       $(PGENOBJS)
196
196
                $(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
197
 
@@ -972,36 +1003,43 @@
 
197
@@ -975,37 +1006,43 @@
198
198
                        $(DESTDIR)$(LIBDEST)/distutils/tests ; \
199
199
        fi
200
200
        PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
235
235
+       export PYTHONPATH; PYTHONPATH="$(srcdir)/Lib:$(abs_builddir)/`cat pybuilddir.txt`"; \
236
236
        export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
237
237
        export EXE; EXE="$(BUILDEXE)"; \
238
 
+       if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
 
238
        if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
239
239
+       export PYTHON_FOR_BUILD; \
240
240
+       if [ "$(build)" = "$(host)" ]; then \
241
241
+         PYTHON_FOR_BUILD="$(BUILDPYTHON)"; \
245
245
        cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
246
246
 
247
247
 python-config: $(srcdir)/Misc/python-config.in
248
 
@@ -1100,7 +1138,7 @@
 
248
@@ -1104,7 +1141,7 @@
249
249
 # Install the dynamically loadable modules
250
250
 # This goes into $(exec_prefix)
251
251
 sharedinstall: sharedmods
254
254
                --prefix=$(prefix) \
255
255
                --install-scripts=$(BINDIR) \
256
256
                --install-platlib=$(DESTSHARED) \
257
 
@@ -1173,7 +1211,7 @@
 
257
@@ -1177,7 +1214,7 @@
258
258
 # This installs a few of the useful scripts in Tools/scripts
259
259
 scriptsinstall:
260
260
        SRCDIR=$(srcdir) $(RUNSHARED) \
263
263
        --prefix=$(prefix) \
264
264
        --install-scripts=$(BINDIR) \
265
265
        --root=$(DESTDIR)/
266
 
@@ -1240,7 +1278,7 @@
 
266
@@ -1244,7 +1281,7 @@
267
267
 
268
268
 clobber: clean profile-removal
269
269
        -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
3740
3740
        if test "$CXX" = "notfound"
3741
3741
        then
3742
3742
                CXX=""
3743
 
@@ -763,22 +829,23 @@
 
3743
@@ -766,22 +832,23 @@
3744
3744
 
3745
3745
 AC_MSG_CHECKING(for --enable-profiling)
3746
3746
 AC_ARG_ENABLE(profiling,
3780
3780
 
3781
3781
 AC_MSG_CHECKING(LDLIBRARY)
3782
3782
 
3783
 
@@ -870,11 +937,15 @@
 
3783
@@ -873,11 +940,15 @@
3784
3784
 fi
3785
3785
 AC_SUBST(PY_ENABLE_SHARED)
3786
3786
 
3797
3797
 
3798
3798
 # tweak ARFLAGS only if the user didn't set it on the command line
3799
3799
 AC_SUBST(ARFLAGS)
3800
 
@@ -1054,7 +1125,7 @@
 
3800
@@ -1057,7 +1128,7 @@
3801
3801
     # if using gcc on alpha, use -mieee to get (near) full IEEE 754
3802
3802
     # support.  Without this, treatment of subnormals doesn't follow
3803
3803
     # the standard.
3806
3806
          alpha*)
3807
3807
                 BASECFLAGS="$BASECFLAGS -mieee"
3808
3808
                 ;;
3809
 
@@ -3227,7 +3298,12 @@
 
3809
@@ -3230,7 +3301,12 @@
3810
3810
 ]]])],
3811
3811
 [ac_cv_buggy_getaddrinfo=no],
3812
3812
 [ac_cv_buggy_getaddrinfo=yes],
3820
3820
 fi
3821
3821
 
3822
3822
 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
3823
 
@@ -4270,26 +4346,31 @@
 
3823
@@ -4273,26 +4349,31 @@
3824
3824
 )
3825
3825
 CPPFLAGS=$ac_save_cppflags
3826
3826
 
3868
3868
 fi
3869
3869
 
3870
3870
 if test "$have_long_long" = yes
3871
 
@@ -4329,7 +4410,23 @@
 
3871
@@ -4332,7 +4413,23 @@
3872
3872
   ]]])],
3873
3873
   [ac_cv_have_long_long_format=yes],
3874
3874
   [ac_cv_have_long_long_format=no],
4582
4582
             # OS X 10.5 comes with libffi.dylib; the include files are
4583
4583
             # in /usr/include/ffi
4584
4584
             inc_dirs.append('/usr/include/ffi')
4585
 
Index: b/Tools/scripts/h2py.py
4586
 
===================================================================
4587
 
--- a/Tools/scripts/h2py.py
4588
 
+++ b/Tools/scripts/h2py.py
4589
 
@@ -58,6 +58,10 @@
4590
 
                 raise KeyError
4591
 
         except KeyError:
4592
 
             searchdirs=['/usr/include']
4593
 
+try:
4594
 
+    searchdirs.insert(0,os.path.join('/usr/include',os.environ['MULTIARCH']))
4595
 
+except KeyError:
4596
 
+    pass
4597
 
 
4598
 
 def main():
4599
 
     global filedict
4600
4585
Index: b/Lib/plat-generic/regen
4601
4586
===================================================================
4602
4587
--- a/Lib/plat-generic/regen