[Python-apps-commits] r7760 - in packages/mercurial/trunk/debian (3 files)

[vicho-guest at users.alioth.debian.org]

    Date: Thursday, November 3, 2011 @ 23:05:12
  Author: vicho-guest
Revision: 7760

Fix #636396 by compiling bdiff.c without optimizations in armel

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2011-11-03 22:38:19 UTC (rev 7759)
+++ packages/mercurial/trunk/debian/changelog	2011-11-03 23:05:12 UTC (rev 7760)
@@ -1,3 +1,12 @@
+mercurial (2.0-2) unstable; urgency=low
+
+  * 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)
+
+ -- Javi Merino <cibervicho at gmail.com>  Thu, 03 Nov 2011 23:00:43 +0000
+
 mercurial (2.0-1) unstable; urgency=low
 
   * New upstream release 2.0

Added: packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch	2011-11-03 23:05:12 UTC (rev 7760)
@@ -0,0 +1,30 @@
+From: Javi Merino <cibervicho at gmail.com>
+Description: gcc-4.6 -O2 miscompiles bdiff in armel
+ This patch disables optimizations for bdiff in -O0 so that mercurial
+ works in armel while we fix it in gcc.
+ .
+ Mercurial says it's not their problem so they won't accept the patch.
+ In any case, this has to be a temporal hack.
+Bug-Debian: http://bugs.debian.org/636396
+Bug-Mercurial: http://mercurial.selenic.com/bts/issue2877
+
+--- a/setup.py
++++ b/setup.py
+@@ -349,12 +349,16 @@
+ 
+ extmodules = [
+     Extension('mercurial.base85', ['mercurial/base85.c']),
+-    Extension('mercurial.bdiff', ['mercurial/bdiff.c']),
+     Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']),
+     Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
+     Extension('mercurial.parsers', ['mercurial/parsers.c']),
+     ]
+ 
++if platform.machine() == 'armv5tel':
++    extmodules.append(Extension('mercurial.bdiff', ['mercurial/bdiff.c'], extra_compile_args=['-O0']))
++else:
++    extmodules.append(Extension('mercurial.bdiff', ['mercurial/bdiff.c']))
++
+ osutil_ldflags = []
+ 
+ if sys.platform == 'darwin':

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2011-11-03 22:38:19 UTC (rev 7759)
+++ packages/mercurial/trunk/debian/patches/series	2011-11-03 23:05:12 UTC (rev 7760)
@@ -6,3 +6,4 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
+deb_specific__no_optim_bdiff_armel.patch