Fix build error with scons-4.4.0 version which is based on python3

[platform/upstream/iotivity.git] / build_common / linux / SConscript

diff --git a/build_common/linux/SConscript b/build_common/linux/SConscript
index 4db665d..dbd881c 100644 (file)
--- a/build_common/linux/SConscript
+++ b/build_common/linux/SConscript
@@ -1,10 +1,11 @@
+# -*- mode: python; python-indent-offset: 4; indent-tabs-mode: nil -*-
 ##
 # This script set linux specific flags (GNU GCC)
 #
 ##
 Import('env')
 
-print "Reading linux configuration script"
+print("Reading linux configuration script")
 
 # Set release/debug flags
 if env.get('RELEASE'):
@@ -12,17 +13,21 @@ if env.get('RELEASE'):
        env.AppendUnique(CPPDEFINES = ['NDEBUG'])
 else:
        env.AppendUnique(CCFLAGS = ['-g'])
-       env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
-       
-env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__linux__'])
-env.AppendUnique(CCFLAGS = ['-Wall', '-fPIC','`pkg-config','--cflags','glib-2.0`'])
-env.AppendUnique(LINKFLAGS = ['-ldl', '-lpthread', '-lglib-2.0', '-lgthread-2.0'])
 
-env.Append(LIBS=[
-  '-lglib-2.0', '-lgthread-2.0'
-])
+# Test Coverage Flags and Library (if RELEASE=0)
+if not env.get('RELEASE') and env.get('COVERAGE_CHECKS'):
+    env.AppendUnique(CCFLAGS=['--coverage', '-fPIC', '-O0'])
+    env.AppendUnique(LINKFLAGS=['--coverage'])
+
+if env.get('LOGGING'):
+    env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+
+env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__linux__'])
+env.AppendUnique(CFLAGS = ['-std=gnu99'])
+env.AppendUnique(CCFLAGS = ['-Wall', '-Wextra', '-fPIC'])
+env.AppendUnique(LIBS = ['dl', 'pthread', 'uuid'])
 
-# Set arch flags
+# Set arch flags that match best TARGET_ARCH variable
 target_arch = env.get('TARGET_ARCH')
 if target_arch in ['x86']:
        env.AppendUnique(CCFLAGS = ['-m32'])
@@ -30,6 +35,8 @@ if target_arch in ['x86']:
 elif target_arch in ['x86_64']:
        env.AppendUnique(CCFLAGS = ['-m64'])
        env.AppendUnique(LINKFLAGS = ['-m64'])
+elif target_arch in ['arm'] or target_arch.find('v5') > 0:
+       env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
 elif target_arch.find('v7a-hard') > 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
        env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
@@ -37,7 +44,5 @@ elif target_arch.find('v7a-hard') > 0:
        env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard'])
 elif target_arch.find('v7a') > 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
-elif target_arch.find('arm64') > 0:
+elif target_arch.find('arm64') >= 0:
        env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
-else:
-       env.AppendUnique(CPPFLAGS = ['-march=armv5te'])