From 30cc6888b883c5161ff32f210c231b8f8ae4504b Mon Sep 17 00:00:00 2001 From: James Cloos Date: Fri, 18 Jan 2013 16:11:36 -0500 Subject: sci-physics/openmx: Fix fftw dependency. Openmx had asked for fftw slot 3, but fftw provides slot 3.0. Signed-off-by: James Cloos --- sci-physics/openmx/openmx-3.6.ebuild | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'sci-physics/openmx/openmx-3.6.ebuild') diff --git a/sci-physics/openmx/openmx-3.6.ebuild b/sci-physics/openmx/openmx-3.6.ebuild index 78f65a3c0..4f83c2ac4 100644 --- a/sci-physics/openmx/openmx-3.6.ebuild +++ b/sci-physics/openmx/openmx-3.6.ebuild @@ -20,11 +20,8 @@ S="${WORKDIR}/${PN}${PV}" RDEPEND="virtual/blas virtual/lapack - sci-libs/fftw:3 - mpi? ( virtual/mpi - sci-libs/fftw:3[mpi] ) - openmp? ( sys-devel/gcc[openmp] - sci-libs/fftw:3[openmp] )" + sci-libs/fftw:3.0[mpi?,openmp?] + mpi? ( virtual/mpi )" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -37,7 +34,11 @@ pkg_setup() { fi if use openmp; then - export CC="${CC} -fopenmp" + if tc-has-openmp; then + export CC="${CC} -fopenmp" + else + die "Please switch to an openmp compatible compiler" + fi fi } @@ -68,8 +69,8 @@ src_configure() { local MX_LIB="${MX_LIB} $(pkg-config --static --libs ${FFTW_FLAVOUR})" sed -i -e "s%^CC *=.*$%CC = ${CC} ${CFLAGS}%" \ - -e "s%^LIB *=.*$%LIB = ${MX_LIB}%" \ - source/makefile + -e "s%^LIB *=.*$%LIB = ${MX_LIB}%" \ + source/makefile } src_compile() { @@ -93,4 +94,4 @@ src_install() { emake DESTDIR="${D}/usr/bin" install dodoc "${S}/${PN}${PV}.pdf" use test && dodoc "${S}"/work/runtest.result -} \ No newline at end of file +} -- cgit v1.2.3-18-g5258