summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-mathematics/normaliz/ChangeLog6
-rw-r--r--sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch11
-rw-r--r--sci-mathematics/normaliz/normaliz-2.12.2.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog
index cead83ad7cc4..ab6a23f2ccc3 100644
--- a/sci-mathematics/normaliz/ChangeLog
+++ b/sci-mathematics/normaliz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/normaliz
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.23 2015/01/29 10:02:44 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.24 2015/03/01 12:22:49 tomka Exp $
+
+ 01 Mar 2015; Thomas Kahle <tomka@gentoo.org>
+ +files/normaliz-2.12.2-gcc49.patch, normaliz-2.12.2.ebuild:
+ Fix gcc-4.9 build (541364)
*normaliz-2.12.2 (29 Jan 2015)
diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch b/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch
new file mode 100644
index 000000000000..35a28c8cf2a3
--- /dev/null
+++ b/sci-mathematics/normaliz/files/normaliz-2.12.2-gcc49.patch
@@ -0,0 +1,11 @@
+diff -U 3 -dHrN Normaliz2.12/source/libnormaliz/general.h Normaliz2.12.patched/source/libnormaliz/general.h
+--- Normaliz2.12/source/libnormaliz/general.h 2014-10-23 15:01:56.000000000 +0200
++++ Normaliz2.12.patched/source/libnormaliz/general.h 2015-03-01 13:20:01.057017555 +0100
+@@ -27,6 +27,7 @@
+
+ #include <iostream>
+ #include <assert.h>
++#include <cstddef>
+
+ #ifdef _WIN32 //for 32 and 64 bit windows
+ #define NMZ_MPIR //always use MPIR
diff --git a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
index 027b7eb1e88c..07f3a2f24db4 100644
--- a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
+++ b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.1 2015/01/29 10:02:44 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.2 2015/03/01 12:22:49 tomka Exp $
EAPI=5
@@ -28,6 +28,7 @@ S=${WORKDIR}/${MYP}
src_prepare () {
epatch "${FILESDIR}/${PN}-2.12.1-respect-flags.patch"
+ epatch "${FILESDIR}/${PN}-2.12.2-gcc49.patch"
# Respect users AR tool (Bug 474532)
sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die