1From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001 2From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> 3Date: Thu, 9 Jan 2020 10:07:20 +0100 4Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise 5 keyword syntax - has_key deprecated method is now removed - commands 6 deprecated library is replaced by subprocess - print function fixes 7 8This should fix FTBFS against new scons 3.1.2 9https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 10--- 11Upstream-Status: Pending 12 13 SConstruct | 45 +++++++++++++++++++++++---------------------- 14 1 file changed, 23 insertions(+), 22 deletions(-) 15 16diff --git a/SConstruct b/SConstruct 17index ae3df10b..9d1c8914 100644 18--- a/SConstruct 19+++ b/SConstruct 20@@ -1,18 +1,19 @@ 21-import os, sys, commands 22+import os, sys 23+from subprocess import check_output 24 env = Environment(ENV = os.environ) 25 26 # figure out a better way to configure this 27-if os.environ.has_key('CXX'): 28+if 'CXX' in os.environ: 29 env['CXX'] = os.environ['CXX'] 30 31-if os.environ.has_key('DEBUG'): 32+if 'DEBUG' in os.environ: 33 env['DEBUG'] = os.environ['DEBUG'] 34 35-if os.environ.has_key('CXXFLAGS'): 36+if 'CXXFLAGS' in os.environ: 37 #env['CXXFLAGS'] = os.environ['CXXFLAGS'] 38 env.Append(CXXFLAGS = os.environ['CXXFLAGS']) 39 40-if os.environ.has_key('LINKFLAGS'): 41+if 'LINKFLAGS' in os.environ: 42 #env['LDFLAGS'] = os.environ['LDFLAGS'] 43 env.Append(LINKFLAGS = os.environ['LINKFLAGS']) 44 45@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'): 46 ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and 47 ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu. 48 ## 49-if os.environ.has_key('BOOSTROOT'): 50+if 'BOOSTROOT' in os.environ: 51 os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT'] 52 53-if os.environ.has_key('BOOST_ROOT'): 54+if 'BOOST_ROOT' in os.environ: 55 env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT'] 56 env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib') 57-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'): 58+elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ: 59 env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES'] 60 env['BOOST_LIBS'] = os.environ['BOOST_LIBS'] 61 else: 62- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!" 63+ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!") 64 65 ## Custom OpenSSL 66-if os.environ.has_key('OPENSSL_PATH'): 67+if 'OPENSSL_PATH' in os.environ: 68 env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include')) 69 env.Append(LIBPATH = os.environ['OPENSSL_PATH']) 70 71-if os.environ.has_key('WSPP_ENABLE_CPP11'): 72+if 'WSPP_ENABLE_CPP11' in os.environ: 73 env['WSPP_ENABLE_CPP11'] = True 74 else: 75 env['WSPP_ENABLE_CPP11'] = False 76@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'): 77 env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags) 78 env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86' 79 elif env['PLATFORM'] == 'posix': 80- if env.has_key('DEBUG'): 81+ if 'DEBUG' in env: 82 env.Append(CCFLAGS = ['-g', '-O0']) 83 else: 84 env.Append(CPPDEFINES = ['NDEBUG']) 85@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix': 86 env.Append(CCFLAGS = ['-Wall']) 87 #env['LINKFLAGS'] = '' 88 elif env['PLATFORM'] == 'darwin': 89- if not os.environ.has_key('CXX'): 90+ if not 'CXX' in os.environ: 91 env['CXX'] = "clang++" 92- if env.has_key('DEBUG'): 93+ if 'DEBUG' in env: 94 env.Append(CCFLAGS = ['-g', '-O0']) 95 else: 96 env.Append(CPPDEFINES = ['NDEBUG']) 97@@ -157,29 +158,29 @@ env_cpp11 = env.Clone () 98 99 if env_cpp11['CXX'].startswith('g++'): 100 # TODO: check g++ version 101- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion') 102+ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion']) 103 104- if GCC_VERSION > "4.4.0": 105- print "C++11 build environment partially enabled" 106+ if GCC_VERSION.decode('utf-8') > "4.4.0": 107+ print("C++11 build environment partially enabled") 108 env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) 109 else: 110- print "C++11 build environment is not supported on this version of G++" 111+ print("C++11 build environment is not supported on this version of G++") 112 elif env_cpp11['CXX'].startswith('clang++'): 113- print "C++11 build environment enabled" 114+ print("C++11 build environment enabled") 115 env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++']) 116 env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) 117 118 # look for optional second boostroot compiled with clang's libc++ STL library 119 # this prevents warnings/errors when linking code built with two different 120 # incompatible STL libraries. 121- if os.environ.has_key('BOOST_ROOT_CPP11'): 122+ if 'BOOST_ROOT_CPP11' in os.environ: 123 env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11'] 124 env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib') 125- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'): 126+ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ: 127 env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11'] 128 env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11'] 129 else: 130- print "C++11 build environment disabled" 131+ print("C++11 build environment disabled") 132 133 # if the build system is known to allow the isystem modifier for library include 134 # values then use it for the boost libraries. Otherwise just add them to the 135