summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2007-05-25 17:33:43 +0000
committerMarkus Dittrich <markusle@gentoo.org>2007-05-25 17:33:43 +0000
commit8322d4b6202138c478bcfa41832608fb414ea83b (patch)
tree5457dd58462266cbcf3c6e5977b5f4d0f32bf901 /sci-mathematics
parentadd snapshot, bug 161883 (diff)
downloadgentoo-2-8322d4b6202138c478bcfa41832608fb414ea83b.tar.gz
gentoo-2-8322d4b6202138c478bcfa41832608fb414ea83b.tar.bz2
gentoo-2-8322d4b6202138c478bcfa41832608fb414ea83b.zip
Changed ebuild to adhere to multilib (see bug #179700).
(Portage version: 2.1.2.7)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/Macaulay2/ChangeLog6
-rw-r--r--sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 072d799a0455..bc9378dee455 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/Macaulay2
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.12 2007/03/14 07:02:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.13 2007/05/25 17:33:43 markusle Exp $
+
+ 25 May 2007; Markus Dittrich <markusle@gentoo.org>
+ Macaulay2-0.9.95-r1.ebuild:
+ Changed ebuild to adhere to multilib (see bug #179700).
14 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
Macaulay2-0.9.95-r1.ebuild:
diff --git a/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild
index ab4bf4f3435a..7cfeee2ef34e 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild,v 1.5 2007/03/14 07:02:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95-r1.ebuild,v 1.6 2007/05/25 17:33:43 markusle Exp $
inherit elisp-common eutils flag-o-matic toolchain-funcs autotools
@@ -56,7 +56,7 @@ src_compile() {
-i include/config.Makefile.in || \
die "failed to fix makefile"
make && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
- LDFLAGS="-L${WORKDIR}/lib" \
+ LDFLAGS="-L${WORKDIR}/$(get_libdir)" \
./configure --prefix="${D}/usr" --disable-encap \
--with-lapacklibs="-llapack -lblas" || \
die "failed to configure Macaulay"
@@ -74,7 +74,8 @@ src_install () {
make install || die "install failed"
# nothing in here, get rid of it
- rm -fr "${D}"/usr/lib || die "failed to remove empty /usr/lib"
+ rm -fr "${D}"/usr/$(get_libdir) || \
+ die "failed to remove empty /usr/lib"
use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
}