diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-05-06 04:58:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-05-06 04:58:37 +0000 |
| commit | a99320e5cfba3de832f39aeed67d23065bace5cf (patch) | |
| tree | cc3f3db4665293d9e5b374c3f582748adfcd7883 /dev-libs | |
| parent | Stable on x86; bug #131135 (diff) | |
| download | gentoo-2-a99320e5cfba3de832f39aeed67d23065bace5cf.tar.gz gentoo-2-a99320e5cfba3de832f39aeed67d23065bace5cf.tar.bz2 gentoo-2-a99320e5cfba3de832f39aeed67d23065bace5cf.zip | |
Grab patch from Debian to fix test crashes #126082.
(Portage version: 2.1_pre10-r3)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/mpfr/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/mpfr/files/2.2.0/debian-disable-buggy-umul_ppmm.patch | 22 | ||||
| -rw-r--r-- | dev-libs/mpfr/mpfr-2.2.0_p10.ebuild | 6 |
3 files changed, 30 insertions, 4 deletions
diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog index b3f29320da8d..aeeca6bdb5e8 100644 --- a/dev-libs/mpfr/ChangeLog +++ b/dev-libs/mpfr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/mpfr # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.20 2006/04/10 03:39:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.21 2006/05/06 04:58:37 vapier Exp $ + + 06 May 2006; Mike Frysinger <vapier@gentoo.org> + +files/2.2.0/debian-disable-buggy-umul_ppmm.patch, mpfr-2.2.0_p10.ebuild: + Grab patch from Debian to fix test crashes #126082. *mpfr-2.2.0_p10 (10 Apr 2006) diff --git a/dev-libs/mpfr/files/2.2.0/debian-disable-buggy-umul_ppmm.patch b/dev-libs/mpfr/files/2.2.0/debian-disable-buggy-umul_ppmm.patch new file mode 100644 index 000000000000..804c4d9512f0 --- /dev/null +++ b/dev-libs/mpfr/files/2.2.0/debian-disable-buggy-umul_ppmm.patch @@ -0,0 +1,22 @@ +Ripped from Debian's mpfr_2.2.0.dfsg.1-6.diff.gz + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363287 +http://bugs.gentoo.org/show_bug.cgi?id=126082 +http://sympa.loria.fr/wwsympa/arc/mpfr/2006-04/msg00018.html + +Also, this appears to blow up on HPPA 1.0/1.1 systems ... so just +disable for all HPPA systems (although we could check _PA_RISC2_0 ...) + +--- mpfr-2.2.0.dfsg.1.orig/mul.c ++++ mpfr-2.2.0.dfsg.1/mul.c +@@ -307,8 +307,8 @@ + cn = tn; + } + MPFR_ASSERTD (bn >= cn); +- /* longlong's umul_ppmm seems to be buggy on HP-UX. */ +-#ifndef __hpux ++ /* longlong's umul_ppmm seems to be buggy on HP-UX and s390 */ ++#if ! defined (__hpux) && ! defined (__s390__) && ! defined (__hppa__) + if (MPFR_LIKELY (bn <= 2)) + { + if (bn == 1) diff --git a/dev-libs/mpfr/mpfr-2.2.0_p10.ebuild b/dev-libs/mpfr/mpfr-2.2.0_p10.ebuild index df8cc68ced80..2e934296b9df 100644 --- a/dev-libs/mpfr/mpfr-2.2.0_p10.ebuild +++ b/dev-libs/mpfr/mpfr-2.2.0_p10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.2.0_p10.ebuild,v 1.1 2006/04/10 03:39:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.2.0_p10.ebuild,v 1.2 2006/05/06 04:58:37 vapier Exp $ inherit eutils flag-o-matic @@ -36,8 +36,8 @@ src_unpack() { fi done - # Fix hppa 1.1 computation bug - [[ ${CHOST} == hppa[^2]* ]] && sed -e 's/__hpux/__hppa__/' -i "${S}/mul.c" + # Disable buggy code on s390/hppa #126082 + epatch "${FILESDIR}"/${PV}/debian-disable-buggy-umul_ppmm.patch } src_compile() { |