← Back to branch summary

~ubuntu-branches/ubuntu/precise/mercurial/precise-updates

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Package Import Robot
  • Author(s): Javi Merino
  • Date: 2011-11-03 23:00:43 UTC
  • Revision ID: package-import@ubuntu.com-20111103230043-hhvpontux3ne1aw4
Tags: 2.0-2
http://bugs.debian.org/636396
Fix "Cloning fails with: mpatch.mpatchError: patch cannot be decoded"
by not compiling bdiff.c with optimizations in armel.  This is
probably a bug in gcc-4.6 (gcc 4.5 works fine) but while it's solved,
at least mercurial works again in armel (Closes: #636396)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
349
349
 
350
350
extmodules = [
351
351
    Extension('mercurial.base85', ['mercurial/base85.c']),
352
 
    Extension('mercurial.bdiff', ['mercurial/bdiff.c']),
353
352
    Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']),
354
353
    Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
355
354
    Extension('mercurial.parsers', ['mercurial/parsers.c']),
356
355
    ]
357
356
 
 
357
if platform.machine() == 'armv5tel':
 
358
    extmodules.append(Extension('mercurial.bdiff', ['mercurial/bdiff.c'], extra_compile_args=['-O0']))
 
359
else:
 
360
    extmodules.append(Extension('mercurial.bdiff', ['mercurial/bdiff.c']))
 
361
 
358
362
osutil_ldflags = []
359
363
 
360
364
if sys.platform == 'darwin':