summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-09-29 07:02:31 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-09-29 07:02:31 +0000
commitae65df8be993f95a2b98df738671095bc04d21ae (patch)
treede04e4b3e9e39af5ed615f7f4983e23d9e70232b /app-misc
parentVersion bump. (diff)
downloadgentoo-2-ae65df8be993f95a2b98df738671095bc04d21ae.tar.gz
gentoo-2-ae65df8be993f95a2b98df738671095bc04d21ae.tar.bz2
gentoo-2-ae65df8be993f95a2b98df738671095bc04d21ae.zip
Fix a runtime error on amd64
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/geneweb/ChangeLog6
-rw-r--r--app-misc/geneweb/files/geneweb-5.02-amd64.patch11
-rw-r--r--app-misc/geneweb/geneweb-5.02.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 0a3e5bcc2f49..9fdc3bb48c1a 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/geneweb
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.15 2011/09/28 08:09:15 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.16 2011/09/29 07:02:31 tupone Exp $
+
+ 29 Sep 2011; Alfredo Tupone <tupone@gentoo.org> geneweb-5.02.ebuild,
+ +files/geneweb-5.02-amd64.patch:
+ Fix a runtime error on amd64
28 Sep 2011; Alfredo Tupone <tupone@gentoo.org> files/geneweb.initd:
Updated the initd file, avoiding warning at startup
diff --git a/app-misc/geneweb/files/geneweb-5.02-amd64.patch b/app-misc/geneweb/files/geneweb-5.02-amd64.patch
new file mode 100644
index 000000000000..6ca0c3197a9f
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-5.02-amd64.patch
@@ -0,0 +1,11 @@
+--- src/iovalue.ml.old 2011-09-29 08:55:02.000000000 +0200
++++ src/iovalue.ml 2011-09-29 08:55:42.000000000 +0200
+@@ -10,7 +10,7 @@
+ read inside a value output by output_value (no headers) must
+ match OCaml's input_value system (intern.c) *)
+
+-value sizeof_long = Sys.word_size / 8;
++value sizeof_long = 32 / 8;
+ value sign_extend_shift = (sizeof_long - 1) * 8 - 1;
+ value sign_extend x = (x lsl sign_extend_shift) asr sign_extend_shift;
+
diff --git a/app-misc/geneweb/geneweb-5.02.ebuild b/app-misc/geneweb/geneweb-5.02.ebuild
index 73fe59814651..8bd592cc3f2c 100644
--- a/app-misc/geneweb/geneweb-5.02.ebuild
+++ b/app-misc/geneweb/geneweb-5.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.02.ebuild,v 1.2 2011/03/24 13:08:04 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.02.ebuild,v 1.3 2011/09/29 07:02:31 tupone Exp $
EAPI=2
inherit eutils
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-amd64.patch \
"${FILESDIR}"/${P}-parallellbuild.patch
sed -i -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
setup/setup.ml || die "Failed sed for gentoo path"