Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 228183 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild (+7 lines)
Lines 13-18 Link Here
13
SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
13
SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
14
HOMEPAGE="http://www.lam-mpi.org"
14
HOMEPAGE="http://www.lam-mpi.org"
15
DEPEND="pbs? ( sys-cluster/torque )
15
DEPEND="pbs? ( sys-cluster/torque )
16
	sys-devel/libtool
16
	!sys-cluster/mpich
17
	!sys-cluster/mpich
17
	!sys-cluster/openmpi
18
	!sys-cluster/openmpi
18
	!sys-cluster/mpich2"
19
	!sys-cluster/mpich2"
Lines 39-44 Link Here
39
	epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
40
	epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
40
	epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
41
	epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
41
	epatch "${FILESDIR}"/7.1.4-as-needed.patch
42
	epatch "${FILESDIR}"/7.1.4-as-needed.patch
43
	epatch "${FILESDIR}"/${PN}-7.1.4-libtool-compatibility.patch
42
44
43
	# gcc-4.3.0 fix.  char *argv[] -> char **argv.
45
	# gcc-4.3.0 fix.  char *argv[] -> char **argv.
44
	# replaces a few more than necessary, but should be harmless.
46
	# replaces a few more than necessary, but should be harmless.
Lines 47-52 Link Here
47
		sed -i 's:^\(int main(int argc, char\)[^{]*\([{]\?\):\1** argv) \2:g' $f
49
		sed -i 's:^\(int main(int argc, char\)[^{]*\([{]\?\):\1** argv) \2:g' $f
48
	done
50
	done
49
51
52
        ebegin "Remove provided libtool/libltdl"
53
        rm -R ./share/libltdl \
54
        || die "removing libtool failed"
55
        eend 0
56
50
	# eautoreconf doesn't work correctly as lam-mpi uses their own
57
	# eautoreconf doesn't work correctly as lam-mpi uses their own
51
	# LAM_CONFIG_SUBDIR instead of AC_CONFIG_SUBDIRS.  Even better, they use
58
	# LAM_CONFIG_SUBDIR instead of AC_CONFIG_SUBDIRS.  Even better, they use
52
	# variables inside of the definitions, so --trace doesn't work.
59
	# variables inside of the definitions, so --trace doesn't work.

Return to bug 228183