Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/relax/files: relax-3.2.2-gentoo.patch
Date: Fri, 06 Jun 2014 08:10:18
Message-Id: 20140606081014.988322004F@flycatcher.gentoo.org
1 jlec 14/06/06 08:10:14
2
3 Added: relax-3.2.2-gentoo.patch
4 Log:
5 sci-chemistry/relax: Version Bump
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
8
9 Revision Changes Path
10 1.1 sci-chemistry/relax/files/relax-3.2.2-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/relax/files/relax-3.2.2-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/relax/files/relax-3.2.2-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: relax-3.2.2-gentoo.patch
16 ===================================================================
17 sconstruct | 7 ++++++-
18 1 file changed, 6 insertions(+), 1 deletion(-)
19
20 diff --git a/sconstruct b/sconstruct
21 index 511a6dd..fc2d6de 100644
22 --- a/sconstruct
23 +++ b/sconstruct
24 @@ -25,7 +25,7 @@
25
26
27 # Import statements.
28 -from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk
29 +from os import F_OK, access, getcwd, path, remove, rmdir, sep, walk, environ
30 import platform
31 from re import search
32 from shutil import rmtree
33 @@ -630,6 +630,11 @@ class Main:
34 for file in files:
35 nodes.append(env.SharedObject(dir + path.sep + file, CCFLAGS=cflags))
36
37 + env.Append(LINKFLAGS = environ['LDFLAGS'])
38 + env.Append(CFLAGS = environ['CFLAGS'])
39 + env.Replace(CC = environ['CC'])
40 +
41 +
42 # Build the relaxation curve fitting module.
43 self.relax_fit_object = env.SharedLibrary(target=dir + path.sep + 'relax_fit', source=nodes, SHLIBPREFIX=prefix, SHLIBSUFFIX=suffix)