summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@gentoo.org>2009-01-26 15:12:01 +0000
committerJustin Bronder <jsbronder@gentoo.org>2009-01-26 15:12:01 +0000
commit673be2450696c327c64629da18b06d1cff6e0c55 (patch)
treed2ccc6ae413eeb96b46e7930929899185d54ccde /sys-cluster
parentFix use source (reported in bug #255649) and use EANT_GENTOO_CLASSPATH. (diff)
downloadgentoo-2-673be2450696c327c64629da18b06d1cff6e0c55.tar.gz
gentoo-2-673be2450696c327c64629da18b06d1cff6e0c55.tar.bz2
gentoo-2-673be2450696c327c64629da18b06d1cff6e0c55.zip
sys-cluster/lam-mpi-7.1.4-r1: Conditionally apply the libtool compatibility patch.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/lam-mpi/ChangeLog6
-rw-r--r--sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild9
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index b81961eea520..6033e76c4df6 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/lam-mpi
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.70 2009/01/25 21:01:30 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.71 2009/01/26 15:12:01 jsbronder Exp $
+
+ 26 Jan 2009; Justin Bronder <jsbronder@gentoo.org>
+ lam-mpi-7.1.4-r1.ebuild:
+ Conditionally apply the libtool compatibility patch.
*lam-mpi-7.1.4-r1 (25 Jan 2009)
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
index fcacafab0e3a..3b3dba60273e 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.1 2009/01/25 21:01:30 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.2 2009/01/26 15:12:01 jsbronder Exp $
inherit autotools eutils fortran flag-o-matic multilib portability
@@ -39,7 +39,12 @@ src_unpack() {
epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
epatch "${FILESDIR}"/7.1.4-as-needed.patch
- epatch "${FILESDIR}"/${PN}-7.1.4-libtool.patch
+
+ if has_version '>=sys-devel/libtool-2.2'; then
+ # Compatibility patch for the newer libtools, uses LT_INIT
+ # which is not compatible with older versions.
+ epatch "${FILESDIR}"/${PN}-7.1.4-libtool.patch
+ fi
# gcc-4.3.0 fix. char *argv[] -> char **argv.
# replaces a few more than necessary, but should be harmless.