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

[vicho at users.alioth.debian.org]

    Date: Saturday, March 10, 2012 @ 21:17:43
  Author: vicho
Revision: 8289

Drop patch "deb_specific__no_optim_bdiff_armel.patch" as gcc no longer miscompiles bdiff in armel

In any case, we now have the testsuite should the problem reappear.

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-03-10 16:07:10 UTC (rev 8288)
+++ packages/mercurial/trunk/debian/changelog	2012-03-10 21:17:43 UTC (rev 8289)
@@ -1,8 +1,10 @@
 mercurial (2.1.1-3) UNRELEASED; urgency=low
 
   * Add armel to the list of architectures with slow buildds
+  * Drop patch "deb_specific__no_optim_bdiff_armel.patch" as gcc no
+    longer miscompiles bdiff in armel
 
- -- Javi Merino <vicho at debian.org>  Sat, 10 Mar 2012 15:19:24 +0000
+ -- Javi Merino <vicho at debian.org>  Sat, 10 Mar 2012 16:22:01 +0000
 
 mercurial (2.1.1-2) unstable; urgency=low
 

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch	2012-03-10 16:07:10 UTC (rev 8288)
+++ packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch	2012-03-10 21:17:43 UTC (rev 8289)
@@ -1,30 +0,0 @@
-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
-@@ -386,12 +386,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	2012-03-10 16:07:10 UTC (rev 8288)
+++ packages/mercurial/trunk/debian/patches/series	2012-03-10 21:17:43 UTC (rev 8289)
@@ -6,7 +6,6 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
-deb_specific__no_optim_bdiff_armel.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__fix_kfreebsd_test_inherit.patch
 from_upstream__dont_translate_the_abort_message_twice.patch