From bf8b400b0669c340954b7e5bda808edb5034340a Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 3 Mar 2013 10:14:32 +0100 Subject: sci-libs/bigdft: Fix issue 52 Package-Manager: portage-2.2.0_alpha164 --- sci-libs/bigdft/ChangeLog | 9 ++++++--- sci-libs/bigdft/bigdft-1.7_pre12.ebuild | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'sci-libs/bigdft') diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog index 224a6f374..812748003 100644 --- a/sci-libs/bigdft/ChangeLog +++ b/sci-libs/bigdft/ChangeLog @@ -2,7 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -<<<<<<< HEAD + 03 Mar 2013; Justin Lecher bigdft-1.7_pre12.ebuild: + Fix issue 52 + + 03 Mar 2013; Justin Lecher bigdft-1.7_pre12.ebuild: + Fix issue 52 22 Feb 2013; Justin Lecher -bigdft-1.6_pre1-r4.ebuild, bigdft-1.6.0-r2.ebuild, bigdft-1.7_pre12.ebuild, metadata.xml: @@ -50,11 +54,10 @@ +files/bigdft-1.6-tuto.1-gcc-4.6.patch: bigdft-1.6_pre1 from -r2 to -r3: patched to install necessary libraries for GPU support and to compile with gcc-4.6 -======= + 22 Jun 2012; Alexey Shvetsov bigdft-1.6.0-r2.ebuild, bigdft-1.6_pre1-r2.ebuild: [sci-libs/bigdft] add ~amd64-linux ->>>>>>> cd00b2db98a3e0ec9013e1d3646e292213071270 *bigdft-1.6.0-r2 (19 Jun 2012) *bigdft-1.6_pre1-r2 (19 Jun 2012) diff --git a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild index 702845390..8ff693ea1 100644 --- a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild +++ b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild @@ -111,7 +111,7 @@ src_configure() { $(use_enable opencl) $(use_with etsf_io etsf-io) "$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")" - FCFLAGS+=" ${openmp} -I${modules}" + FCFLAGS="${FCFLAGS} ${openmp} -I${modules}" LD="$(tc-getLD)" CPP="$(tc-getCPP)" ) -- cgit v1.2.3