diff options
author | Kacper Kowalik <xarthisius@gentoo.org> | 2010-08-09 17:56:29 +0000 |
---|---|---|
committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-08-09 17:56:29 +0000 |
commit | c317064fa38659c9c17b21597b4053c67c3ee761 (patch) | |
tree | 7fd93934ff42f22d4768d896c1718ecd1e3d00cf /sci-biology | |
parent | Stable for PPC (bug #301828). (diff) | |
download | gentoo-2-c317064fa38659c9c17b21597b4053c67c3ee761.tar.gz gentoo-2-c317064fa38659c9c17b21597b4053c67c3ee761.tar.bz2 gentoo-2-c317064fa38659c9c17b21597b4053c67c3ee761.zip |
Respect LDFLAGS wrt bug 331823. Thanks to Diego for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology')
-rw-r--r-- | sci-biology/shrimp/ChangeLog | 5 | ||||
-rw-r--r-- | sci-biology/shrimp/shrimp-2.0.1.ebuild | 25 |
2 files changed, 21 insertions, 9 deletions
diff --git a/sci-biology/shrimp/ChangeLog b/sci-biology/shrimp/ChangeLog index 992ca71461d1..8eecaa3b3883 100644 --- a/sci-biology/shrimp/ChangeLog +++ b/sci-biology/shrimp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-biology/shrimp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.9 2010/07/25 18:01:15 weaver Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.10 2010/08/09 17:56:29 xarthisius Exp $ + + 09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> shrimp-2.0.1.ebuild: + Respect LDFLAGS wrt bug 331823. Thanks to Diego for report. *shrimp-2.0.1 (25 Jul 2010) diff --git a/sci-biology/shrimp/shrimp-2.0.1.ebuild b/sci-biology/shrimp/shrimp-2.0.1.ebuild index a237b857823b..b682f4f95cc8 100644 --- a/sci-biology/shrimp/shrimp-2.0.1.ebuild +++ b/sci-biology/shrimp/shrimp-2.0.1.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.1 2010/07/25 18:01:15 weaver Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.2 2010/08/09 17:56:29 xarthisius Exp $ EAPI="2" +inherit flag-o-matic toolchain-funcs + MY_PV=${PV//./_} DESCRIPTION="SHort Read Mapping Package" @@ -16,20 +18,27 @@ IUSE="" KEYWORDS="~amd64 ~x86" DEPEND="sys-devel/gcc[openmp]" -RDEPEND="" +RDEPEND="${DEPEND}" # -lgomp -S="${WORKDIR}/SHRiMP_${MY_PV}" +S=${WORKDIR}/SHRiMP_${MY_PV} src_prepare() { - sed -i -e '1 a #include <stdint.h>' common/dag_glue.cpp || die - sed -i -e '1 a CXXFLAGS+= -O3 -mmmx -msse -msse2 -fopenmp' \ - -e 's/-static//' "${S}/Makefile" || die + sed -i -e '1 a #include <stdint.h>' common/dag_glue.cpp || die #294811 + # respect LDFLAGS wrt 331823 + sed -i -e "s/LDFLAGS/LIBS/" -e "s/\$(LD)/& \$(LDFLAGS)/" \ + -e 's/-static//' Makefile || die +} + +src_compile() { + append-flags -fopenmp + tc-export CXX + emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die } src_install() { - rm bin/README + rm bin/README || die dobin bin/* || die insinto /usr/share/${PN} doins -r utils || die - dodoc HISTORY README TODO SPLITTING_AND_MERGING + dodoc HISTORY README TODO SPLITTING_AND_MERGING || die } |