diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-02-13 23:58:56 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-02-13 23:58:56 +0000 |
commit | 65bc77d898d0839b9c95ac904a6d2b32997a0734 (patch) | |
tree | e09c21b6f8aae888dd03796ac1e521d7f87ea3bb /sci-chemistry | |
parent | Bump (diff) | |
download | gentoo-2-65bc77d898d0839b9c95ac904a6d2b32997a0734.tar.gz gentoo-2-65bc77d898d0839b9c95ac904a6d2b32997a0734.tar.bz2 gentoo-2-65bc77d898d0839b9c95ac904a6d2b32997a0734.zip |
fix for test and don't statically link against jpeg
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry')
-rw-r--r-- | sci-chemistry/mosflm/ChangeLog | 5 | ||||
-rw-r--r-- | sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild (renamed from sci-chemistry/mosflm/mosflm-7.0.6.ebuild) | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog index 36923849432e..829162c64676 100644 --- a/sci-chemistry/mosflm/ChangeLog +++ b/sci-chemistry/mosflm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/mosflm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.1 2010/02/06 22:59:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.2 2010/02/13 23:58:56 jlec Exp $ + + 13 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> +mosflm-7.0.6.ebuild: + fix for test and don't statically link against jpeg *mosflm-7.0.6 (06 Feb 2010) diff --git a/sci-chemistry/mosflm/mosflm-7.0.6.ebuild b/sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild index 78f5226fd368..904bc7b8f9ac 100644 --- a/sci-chemistry/mosflm/mosflm-7.0.6.ebuild +++ b/sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6.ebuild,v 1.1 2010/02/06 22:59:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.6-r1.ebuild,v 1.1 2010/02/13 23:58:56 jlec Exp $ EAPI="3" @@ -35,13 +35,14 @@ S="${WORKDIR}/${MY_P}" src_prepare() { rm src/dps/peak_search/dps_peaksearch # See DEPEND -# sed -e "s:../cbf/lib/libcbf.a:/usr/$(get_libdir)/libcbf.a:g" \ - sed -e "s:../jpg/libjpeg.a:${EPREFIX}/usr/$(get_libdir)/libjpeg.a:g" \ +# sed -e "s:../cbf/lib/libcbf.a:${EPREFIX}/usr/$(get_libdir)/libcbf.a:g" \ + sed -e "s:../jpg/libjpeg.a:-ljpeg:g" \ -i ${PN}/Makefile || die epatch \ "${FILESDIR}/${PV}"-Makefile.patch \ "${FILESDIR}/${PV}"-parallel.patch + rm test.f || die } src_compile() { |