aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>2010-07-11 11:07:36 +0200
committerKacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com>2010-07-11 11:07:36 +0200
commit607c614a249db9bbb83e74a29ea27274c0f18ca7 (patch)
tree817fa572aa4e146d61828b04c0eaeaca513fc724 /sci-mathematics
parent[sci-libs/factory]: fix as-needed issue and parallel build (diff)
downloadsci-607c614a249db9bbb83e74a29ea27274c0f18ca7.tar.gz
sci-607c614a249db9bbb83e74a29ea27274c0f18ca7.tar.bz2
sci-607c614a249db9bbb83e74a29ea27274c0f18ca7.zip
[sci-mathematics/gfan]: Respect CXX, LDFLAGS, fix build with GCC-4.5
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/gfan/ChangeLog9
-rw-r--r--sci-mathematics/gfan/Manifest5
-rw-r--r--sci-mathematics/gfan/files/gfan-0.4-gcc45.patch11
-rw-r--r--sci-mathematics/gfan/gfan-0.4.ebuild22
4 files changed, 34 insertions, 13 deletions
diff --git a/sci-mathematics/gfan/ChangeLog b/sci-mathematics/gfan/ChangeLog
index e42041ff8..873af767f 100644
--- a/sci-mathematics/gfan/ChangeLog
+++ b/sci-mathematics/gfan/ChangeLog
@@ -2,14 +2,17 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> gfan-0.4.ebuild,
+ +files/gfan-0.4-gcc45.patch:
+ Respect CXX, LDFLAGS, fix build with GCC-4.5
+
04 Mar 2010; Thomas Kahle <tom111@gmx.de> gfan-0.4.ebuild:
QA/ebuild improvements
- 26 Nov 2009; Thomas Kahle <tom111@gmx.de>
+ 26 Nov 2009; Thomas Kahle <tom111@gmx.de> gfan-0.4.ebuild:
QA Fixes
16 Nov 2009; Thomas Kahle <tom111@gmx.de> +ChangeLog +metadata.xml
- +gfan-0.4.ebuild
+ +gfan-0.4.ebuild:
Initial import (Bug #293381).
-
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 6c480a975..d947d16fe 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -1,4 +1,5 @@
+AUX gfan-0.4-gcc45.patch 265 RMD160 234c52f93317b04534bd8250aad98c3c2ae1c050 SHA1 23d86ce705c16245cf8d314b1a582286d0ba1f2d SHA256 0840ea5682218dca6441b00cfa86bd4d20631c0faab488997a48a8253ede22e0
DIST gfan0.4plus.tar.gz 748514 RMD160 d8a1f235878c7d207e26c00e9097dfea548540e7 SHA1 e8e3f2c2f730c88d0c556f5b0fdf3a99b66b9bac SHA256 bdc4f608df6bda56fdb1bf253fba8e9d9c98dec6915a80a1da9d9ee4210cfff3
-EBUILD gfan-0.4.ebuild 639 RMD160 7ca165057e48516fa9b976c4a53450bf19f4ce6f SHA1 db65e94ab96e333cd2d2660d989dcca237048632 SHA256 5c2a6d3d6d53e1cd78331c17e2d541379efef887f55ed7b73e4ed0b57025cc00
-MISC ChangeLog 386 RMD160 67d4fd36af9c2c4021f917c205afd07d4dd636f8 SHA1 0e6e774d71e79bf775866e9c92d9e6270f5b09e6 SHA256 e0053933946d4eaf11eec63a0cc3fc573e4fbac83eef534094b2aeb22e664c95
+EBUILD gfan-0.4.ebuild 821 RMD160 91f91730b837c79ebf34145569e19090fdfb9e61 SHA1 b279c6e2d77615e8a078de41059a055ef5bbe64e SHA256 5082321088f9376ef83108fdd1c07e436f9bf7cdf28a36c9079a002e26148ccb
+MISC ChangeLog 553 RMD160 b34720146a9aea00d46a70d7a72de0e38fe416ab SHA1 2e433e042a0cdfaf9676043dda2121146f51bad4 SHA256 3295c8046d77092d6b8d259e09938b9726a5ffe8cec828f6f10fef35bb40cb0c
MISC metadata.xml 372 RMD160 77adc83b45fcd2f230d4ee6e957b8e644a6c7600 SHA1 6f80c98489b4086df7f8148965c8046051389f8b SHA256 c10acf91832b281e75cbcf0f09931621f12cbc721d8ad1c645fdcb3800cf4fcf
diff --git a/sci-mathematics/gfan/files/gfan-0.4-gcc45.patch b/sci-mathematics/gfan/files/gfan-0.4-gcc45.patch
new file mode 100644
index 000000000..f60824c2f
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.4-gcc45.patch
@@ -0,0 +1,11 @@
+--- linalg.cpp
++++ linalg.cpp
+@@ -525,7 +525,7 @@
+ }
+
+
+-FieldMatrix::FieldMatrix FieldMatrix::solver()const
++FieldMatrix FieldMatrix::solver()const
+ {
+ FieldMatrix ret=combineOnTop(*this,theField.zHomomorphism(-1)*identity(theField,getWidth())).transposed();
+
diff --git a/sci-mathematics/gfan/gfan-0.4.ebuild b/sci-mathematics/gfan/gfan-0.4.ebuild
index 1b54b5b3f..7b16a6227 100644
--- a/sci-mathematics/gfan/gfan-0.4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.4.ebuild
@@ -4,27 +4,33 @@
EAPI=2
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="gfan computes Groebner fans and tropical varities"
HOMEPAGE="http://www.math.tu-berlin.de/~jensen/software/gfan/gfan.html"
SRC_URI="http://www.math.tu-berlin.de/~jensen/software/gfan/gfan${PV}plus.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
-DEPEND="dev-libs/gmp[-nocxx]
- sci-libs/cddlib"
-
+KEYWORDS="~amd64 ~x86"
IUSE=""
+DEPEND="dev-libs/gmp[-nocxx]
+ sci-libs/cddlib"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/gfan${PV}plus/"
+S=${WORKDIR}/gfan${PV}plus/
src_prepare () {
- sed -i "s/-O2/${CXXFLAGS}/" Makefile
+ sed -i -e "s/-O2/${CXXFLAGS}/" \
+ -e "/GPROFFLAG =/d" \
+ -e "s/g++/$(tc-getCXX)/" \
+ -e "s/\$(CCLINKER)/& \$(LDFLAGS)/" Makefile || die
+
+ # http://trac.sagemath.org/sage_trac/ticket/8770
+ epatch "${FILESDIR}"/${P}-gcc45.patch
}
src_install() {
- dobin gfan || die "emake install failed"
+ dobin gfan || die
}