summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2010-02-05 19:01:28 +0000
committerRaúl Porcel <armin76@gentoo.org>2010-02-05 19:01:28 +0000
commit07c9ec73d70a93ed04ba0b7504331a726525d731 (patch)
treeca6aec1d29af7dc7085da08b3abf374d29f5a3ea /sci-libs/hdf5
parentVersion bump (#301146) (diff)
downloadgentoo-2-07c9ec73d70a93ed04ba0b7504331a726525d731.tar.gz
gentoo-2-07c9ec73d70a93ed04ba0b7504331a726525d731.tar.bz2
gentoo-2-07c9ec73d70a93ed04ba0b7504331a726525d731.zip
Add patch from debian for unaligned acceses, alpha/ia64/sparc stable wrt #299710
(Portage version: 2.1.6.13/cvs/Linux ia64)
Diffstat (limited to 'sci-libs/hdf5')
-rw-r--r--sci-libs/hdf5/ChangeLog7
-rw-r--r--sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch30
-rw-r--r--sci-libs/hdf5/hdf5-1.8.4-r1.ebuild3
3 files changed, 38 insertions, 2 deletions
diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index eb079cf55536..0c579d73fc15 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
B1;1704;0c# ChangeLog for sci-libs/hdf5
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.50 2010/01/21 13:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.51 2010/02/05 19:01:27 armin76 Exp $
+
+ 05 Feb 2010; Raúl Porcel <armin76@gentoo.org> hdf5-1.8.4-r1.ebuild,
+ +files/hdf5-1.8.4-sigbus.patch:
+ Add patch from debian for unaligned acceses, alpha/ia64/sparc stable wrt
+ #299710
21 Jan 2010; Jeroen Roovers <jer@gentoo.org> hdf5-1.8.4-r1.ebuild:
Stable for HPPA (bug #299710).
diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch b/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch
new file mode 100644
index 000000000000..8efa69b8881b
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch
@@ -0,0 +1,30 @@
+Index: hdf5-1.8.4/src/H5detect.c
+===================================================================
+--- hdf5-1.8.4.orig/src/H5detect.c 2010-01-29 12:21:36.000000000 +0100
++++ hdf5-1.8.4/src/H5detect.c 2010-01-29 12:21:52.000000000 +0100
+@@ -470,6 +470,12 @@
+ static void
+ sigsegv_handler(int UNUSED signo)
+ {
++ sigset_t set;
++
++ sigemptyset(&set);
++ sigaddset(&set,SIGSEGV);
++ sigprocmask(SIG_UNBLOCK,&set,NULL);
++
+ signal(SIGSEGV, sigsegv_handler);
+ longjmp(jbuf_g, 1);
+ }
+@@ -495,6 +501,12 @@
+ static void
+ sigbus_handler(int UNUSED signo)
+ {
++ sigset_t set;
++
++ sigemptyset(&set);
++ sigaddset(&set,SIGBUS);
++ sigprocmask(SIG_UNBLOCK,&set,NULL);
++
+ signal(SIGBUS, sigbus_handler);
+ longjmp(jbuf_g, 1);
+ #ifdef H5_HAVE_SIGLONGJMP \ No newline at end of file
diff --git a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
index 3146a9787736..1113305378b6 100644
--- a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.6 2010/01/21 13:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.7 2010/02/05 19:01:27 armin76 Exp $
EAPI=2
inherit eutils autotools
@@ -45,6 +45,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.3-noreturn.patch
epatch "${FILESDIR}"/${P}-gnutools.patch
epatch "${FILESDIR}"/${P}-scaleoffset.patch
+ epatch "${FILESDIR}"/${P}-sigbus.patch
# respect gentoo examples directory
sed -i \