Ubuntu
python2.7 package

Merge lp://staging/~peter-pearse/ubuntu/natty/python2.7/prop001 into lp://staging/ubuntu/natty/python2.7

  1. Natty (11.04)
  2. prop001
  3. Merge into natty
Proposed by Peter Pearse
Status: Needs review
Proposed branch: lp://staging/~peter-pearse/ubuntu/natty/python2.7/prop001
Merge into: lp://staging/ubuntu/natty/python2.7
Diff against target: 582 lines (+344/-16)
4 files modified
debian/changelog (+6/-0)
debian/patches/cross.diff (+201/-0)
debian/patches/series.in (+1/-0)
debian/rules (+136/-16)
To merge this branch: bzr merge lp://staging/~peter-pearse/ubuntu/natty/python2.7/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Needs Fixing
Review via email: mp+48334@code.staging.launchpad.net

Description of the change

debian/rules patched to build a host python for use during the build, remove some symbols not produced for arm, use the Makefile changes below.

Makefile.pre.in patched to use the newly made build host python and pgen where necessary by using the new variables HOSTPYTHON, HOSTPGEN.

setup.py patched to test fro CROSS_COMPILE.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

+diff -Nru py/Modules/makesetup py_patched/Modules/makesetup
+--- py/Modules/makesetup 2011-02-01 13:13:16.000000000 +0000
++++ py_patched/Modules/makesetup 2011-02-02 10:17:05.000000000 +0000
+@@ -281,7 +281,7 @@
+ -) ;;
+ *) <email address hidden>.$$"
+ trap 'rm -f $sedf' 0 1 2 3
+- printf "1i\\" >$sedf
++ echo "1i\\" >$sedf
+ str="# Generated automatically from $makepre by makesetup."
+ echo "$str" >>$sedf
+ echo "s%_MODOBJS_%$OBJS%" >>$sedf

Why this change? printf is a standard command, part of coreutils.

 stamps/stamp-build-debug: stamps/stamp-configure-debug
  dh_testdir
- $(MAKE) $(NJOBS) -C $(buildd_debug)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ $(MAKE) $(NJOBS) -C $(buildd_debug) $(CROSS)
+endif
  touch stamps/stamp-build-debug

Same question as for python2.6: why disabling the debug build?

+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ common_configure_args += \
+ --host=$(DEB_HOST_GNU_TYPE)
+ cross_configure_args = LDFLAGS=-L/usr/$(DEB_HOST_GNU_TYPE)/lib
+else
+ cross_configure_args =
+endif
+

Same comments as for python2.6

+ifeq ($(DEB_HOST_ARCH),armel)
+ @echo "$(DEB_HOST_ARCH) defines PY_NO_SHORT_FLOAT_REPR"
+ nawk ' \
+ $$0 ~ /_Py_dg_dtoa@Base/ {next;} ; \
+ $$0 ~ /_Py_dg_freedtoa@Base/ {next;} ; \
+ $$0 ~ /_Py_dg_strtod@Base/ {next;} ; \
+ {print $$0 ; }; ' debian/libpython.symbols > tmp; \
+ mv tmp debian/libpython.symbols
+endif
+

nawk is not guaranteed to be installed in a build environment, only awk. Please run this as 'awk' instead. (What's the difference between the two names)?

+else
+ : # self-build-dependency in the cross-compilation case
+ python debian/mkbinfmt.py $(PVER) \
+ > $(d_min)/usr/share/binfmts/$(PVER)
+endif

Same comment as for python2.6

review: Needs Fixing
Reply

Unmerged revisions

27. By Peter Pearse

 Modify to allow cross building

------------- This line and the following will be ignored --------------

dded:
  debian/patches/cross.diff
modified:
  debian/changelog
  debian/patches/series.in
  debian/rules

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: