[packages/double-conversion] merge with upstream SConstruct, reuse shared objects

glen glen at pld-linux.org
Sun Oct 6 00:01:41 CEST 2013


commit 6a350ab0e16dac2db289959c193fad8cf8770a7f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 6 00:45:33 2013 +0300

    merge with upstream SConstruct, reuse shared objects

 SConstruct | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/SConstruct b/SConstruct
index 00fe949..d8f7035 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,3 +1,4 @@
+# vim:ft=python
 import os
 
 double_conversion_sources = ['src/' + x for x in SConscript('src/SConscript')]
@@ -10,12 +11,12 @@ prefix = ARGUMENTS.get('prefix', '/usr/local')
 lib = ARGUMENTS.get('libsuffix', 'lib')
 libdir = os.path.join(DESTDIR + prefix, lib)
 
-env = Environment(CPPPATH='#/src')
+env = Environment(CPPPATH='#/src', LIBS=['m', 'stdc++'])
 debug = ARGUMENTS.get('debug', 0)
 optimize = ARGUMENTS.get('optimize', 0)
 env.Replace(CXX = ARGUMENTS.get('CXX', 'g++'))
 
-CCFLAGS = ['-fPIC']
+CCFLAGS = []
 if int(debug):
   CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-g -Wall -Werror'))
 if int(optimize):
@@ -34,7 +35,7 @@ library_name = 'double_conversion'
 
 static_lib = env.StaticLibrary(library_name, double_conversion_static_objects)
 static_lib_pic = env.StaticLibrary(library_name + '_pic', double_conversion_shared_objects)
-shared_lib = env.SharedLibrary(library_name, double_conversion_sources)
+shared_lib = env.SharedLibrary(library_name, double_conversion_shared_objects)
 
 env.Program('run_tests', double_conversion_test_sources, LIBS=[static_lib])
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/double-conversion.git/commitdiff/09cc3773baad68a950e0e992a1908bd97ebf948b



More information about the pld-cvs-commit mailing list