[cig-commits] [commit] master: Changes to relaxlite lib (855518e)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Sun Feb 1 19:30:57 PST 2015


Repository : https://github.com/geodynamics/relax

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/570a8ae866a884c414e8ec4b8e41b42244121721...ccb9b49ada03b6c80429c8a8fa8eaf5b6478b2e1

>---------------------------------------------------------------

commit 855518ecf32fdb73f315870e67415c99009dc309
Author: sagar masuti <sagar.masuti at gmail.com>
Date:   Mon Feb 2 10:56:53 2015 +0800

    Changes to relaxlite lib


>---------------------------------------------------------------

855518ecf32fdb73f315870e67415c99009dc309
 wscript | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wscript b/wscript
index 36ae5eb..d063480 100644
--- a/wscript
+++ b/wscript
@@ -76,7 +76,7 @@ def configure(cnf):
 
  # We set the flags here 
     if not cnf.env.CFLAGS:
-        cnf.env.CFLAGS=['-O3', '-fPIC']
+        cnf.env.CFLAGS=['-O3']
     if not cnf.env.FCFLAGS:
         cnf.env.FCFLAGS=['-O3']
 
@@ -243,7 +243,7 @@ def configure(cnf):
 
     # Check for C preprocessor option
     frag="program main\n  INTEGER :: foo\n" + "end program main\n"
-    cpp_flags=['-cpp','-Mpreprocess','-fpic']
+    cpp_flags=['-cpp','-Mpreprocess']
     if cnf.options.cpp_flag:
         cpp_flags=[cnf.options.cpp_flag]
     found_cpp=False
@@ -281,7 +281,7 @@ def configure(cnf):
     cnf.write_config_header('config.h')
 
 
-def relaxlite(ctx) :
+def lite(ctx) :
         ctx.shlib(features='c fc fcprogram',
                 source=['src/relaxlite.f90',
                         'src/types.f90',
@@ -305,14 +305,14 @@ def relaxlite(ctx) :
                 install_path='${PREFIX}/bin',
                 includes=['build'],
                 use=['gmt','proj','openmp','fftw','imkl','cpp','length','papi','stdc++'],
-                target='relaxlite.so'
+                target='librelax.so'
                 )
 
 from waflib.Build import BuildContext
 
 class miracle(BuildContext):
-    cmd = 'relaxlite'
-    fun = 'relaxlite'
+    cmd = 'lite'
+    fun = 'lite'
 
 def build(bld):
     if bld.env.CUDA:    



More information about the CIG-COMMITS mailing list