Attachment #220254 for bug #251584

View | Details | Raw Unified | Return to bug 251584
Collapse All | Expand All

Lines 28-34 Link Here

(-)Makefile (-1 / +1 lines)
28	USE_GITHUB= yes	28	USE_GITHUB= yes
29	GH_ACCOUNT= eglaysher	29	GH_ACCOUNT= eglaysher
30		30
31	USES= compiler:c++11-lib gl gnome pkgconfig scons:python2 sdl	31	USES= compiler:c++11-lib gl gnome pkgconfig scons sdl
32	USE_GL= glew glu	32	USE_GL= glew glu
33	USE_GNOME= gtk20	33	USE_GNOME= gtk20
34	USE_SDL= image mixer ttf	34	USE_SDL= image mixer ttf




--- SConstruct.orig	2020-12-04 14:47:36 UTC
+++ SConstruct
@@ -19,8 +19,13 @@ AddOption('--fullstatic', action='store_true',
 
 # Set libraries used by all configurations and all binaries in rlvm.
 env = Environment(
+  ENV=os.environ,
   tools = ["default", "rlvm"],
+  **dict((k, v.split()) for k, v in ARGUMENTS.items())
+)
 
+env.Append(
+
+env.Append(
 
   LIBS = ["z"],
 
   LOCAL_LIBS = [],
@@ -184,9 +189,9 @@ int main(int argc, char **argv) {
 def VerifyLibrary(config, library, header):
   if not config.CheckLibWithHeader(library, header, "c"):
     if config.CheckLib(library):
-      print "You have " + library + " installed, but the development headers aren't installed."
+      print("You have " + library + " installed, but the development headers aren't installed.")
     else:
-      print "You need " + library + " to compile this program!"
+      print("You need " + library + " to compile this program!")
     Exit(1)
 
 def CheckForSystemLibrary(config, library_dict, componentlist):
@@ -206,7 +211,7 @@ def CheckForSystemLibrary(config, library_dict, compon
 
   if not res:
     lib_name = library_dict['library']
-    print "(Using included version of %s)" % lib_name
+    print("(Using included version of %s)" % lib_name)
     componentlist.append(lib_name)
     config.Define("HAVE_LIB" + lib_name, 1,
                   "Define to 1 if you have the `%s' library." % lib_name)
@@ -222,7 +227,7 @@ config = env.Configure(custom_tests = {'CheckBoost'   
                                        'CheckGuichan' : CheckGuichan},
                        config_h="build/config.h")
 if not config.CheckBoost('1.40'):
-  print "Boost version >= 1.40 needed to compile rlvm!"
+  print("Boost version >= 1.40 needed to compile rlvm!")
   Exit(1)
 
 VerifyLibrary(config, 'pthread', 'pthread.h')
@@ -239,7 +244,7 @@ VerifyLibrary(config, 'vorbisfile', 'vorbis/vorbisfile
 if env['PLATFORM'] != 'darwin':
   VerifyLibrary(config, 'SDL', 'SDL/SDL.h')
 else:
-  print "Can't properly detect SDL under OSX. Assuming you have the libraries."
+  print("Can't properly detect SDL under OSX. Assuming you have the libraries.")
 
 # Libraries we need, but will use a local copy if not installed.
 local_sdl_libraries = [
@@ -269,12 +274,13 @@ for library_dict in local_sdl_libraries:
   CheckForSystemLibrary(config, library_dict, subcomponents)
 
 if not config.CheckGuichan():
-  print "(Using included copy of guichan)"
+  print("(Using included copy of guichan)")
   subcomponents.append("guichan")
 
 # Get the configuration from sdl and freetype
 env.ParseConfig("sdl-config --cflags")
 env.ParseConfig("freetype-config --cflags --libs")

 
 env = config.Finish()
 
@@ -303,7 +309,6 @@ if GetOption('release'):
   # Now add release optimizations to the environment
   env.Append(
     CPPFLAGS = [

       "-DNDEBUG",
       "-DBOOST_DISABLE_ASSERTS"
     ]
@@ -349,13 +354,7 @@ elif GetOption('pprof'):
              "profiler"]
   )
 else:




--- site_scons/site_tools/rlvm.py.orig	2016-07-30 22:27:57 UTC
+++ site_scons/site_tools/rlvm.py
@@ -56,19 +56,19 @@ def RlvmProgram(env, prog_name, *args, **kwargs):
   objects.extend(args)
 
   # TODO: Deal with RLVM_LIBS in a shared objecty way
-  if kwargs.has_key('rlvm_libs'):
+  if 'rlvm_libs' in kwargs:
     for lib_name in kwargs['rlvm_libs']:
       objects.append(env['LIBPREFIX'] + lib_name + env['LIBSUFFIX'])
 
   # Add all static libraries from the various categories
-  if kwargs.has_key('use_lib_set'):
+  if 'use_lib_set' in kwargs:
     for lib_set_name in kwargs['use_lib_set']:
       lib_set = cloned_env[_MakeStaticName(lib_set_name)]
       if lib_set:
         objects.extend(lib_set)
 
   # First, we need to see if this is a static build
-  if kwargs.has_key("full_static_build") and kwargs['full_static_build'] == True:
+  if 'full_static_build' in kwargs and kwargs['full_static_build'] == True:
     # We must unpack each entry in LIBS and try to locate a static library to
     old_libs = cloned_env['LIBS']
     libpaths = cloned_env['LIBPATH']

Return to bug 251584

Lines 1-19 Link Here

(-)files/patch-SConstruct (-8 / +55 lines)
1	--- SConstruct~	1	--- SConstruct.orig 2020-12-04 14:47:36 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -19,7 +19,12 @@ AddOption('--fullstatic', action='store_	3	@@ -19,8 +19,13 @@ AddOption('--fullstatic', action='store_true',
4		4
5	# Set libraries used by all configurations and all binaries in rlvm.	5	# Set libraries used by all configurations and all binaries in rlvm.
6	env = Environment(	6	env = Environment(
7	+ ENV=os.environ,	7	+ ENV=os.environ,
8	tools = ["default", "rlvm"],	8	tools = ["default", "rlvm"],
9	+ **dict((k, v.split()) for k, v in ARGUMENTS.iteritems())	9	+ **dict((k, v.split()) for k, v in ARGUMENTS.items())
10	+)	10	+)
		11
		12	+env.Append(
11	+	13	+
12	+env.Append(
13
14	LIBS = ["z"],	14	LIBS = ["z"],
15		15
16	@@ -278,6 +275,7 @@ if not config.CheckGuichan():	16	LOCAL_LIBS = [],
		17	@@ -184,9 +189,9 @@ int main(int argc, char **argv) {
		18	def VerifyLibrary(config, library, header):
		19	if not config.CheckLibWithHeader(library, header, "c"):
		20	if config.CheckLib(library):
		21	- print "You have " + library + " installed, but the development headers aren't installed."
		22	+ print("You have " + library + " installed, but the development headers aren't installed.")
		23	else:
		24	- print "You need " + library + " to compile this program!"
		25	+ print("You need " + library + " to compile this program!")
		26	Exit(1)
		27
		28	def CheckForSystemLibrary(config, library_dict, componentlist):
		29	@@ -206,7 +211,7 @@ def CheckForSystemLibrary(config, library_dict, compon
		30
		31	if not res:
		32	lib_name = library_dict['library']
		33	- print "(Using included version of %s)" % lib_name
		34	+ print("(Using included version of %s)" % lib_name)
		35	componentlist.append(lib_name)
		36	config.Define("HAVE_LIB" + lib_name, 1,
		37	"Define to 1 if you have the `%s' library." % lib_name)
		38	@@ -222,7 +227,7 @@ config = env.Configure(custom_tests = {'CheckBoost'
		39	'CheckGuichan' : CheckGuichan},
		40	config_h="build/config.h")
		41	if not config.CheckBoost('1.40'):
		42	- print "Boost version >= 1.40 needed to compile rlvm!"
		43	+ print("Boost version >= 1.40 needed to compile rlvm!")
		44	Exit(1)
		45
		46	VerifyLibrary(config, 'pthread', 'pthread.h')
		47	@@ -239,7 +244,7 @@ VerifyLibrary(config, 'vorbisfile', 'vorbis/vorbisfile
		48	if env['PLATFORM'] != 'darwin':
		49	VerifyLibrary(config, 'SDL', 'SDL/SDL.h')
		50	else:
		51	- print "Can't properly detect SDL under OSX. Assuming you have the libraries."
		52	+ print("Can't properly detect SDL under OSX. Assuming you have the libraries.")
		53
		54	# Libraries we need, but will use a local copy if not installed.
		55	local_sdl_libraries = [
		56	@@ -269,12 +274,13 @@ for library_dict in local_sdl_libraries:
		57	CheckForSystemLibrary(config, library_dict, subcomponents)
		58
		59	if not config.CheckGuichan():
		60	- print "(Using included copy of guichan)"
		61	+ print("(Using included copy of guichan)")
		62	subcomponents.append("guichan")
		63
17	# Get the configuration from sdl and freetype	64	# Get the configuration from sdl and freetype
18	env.ParseConfig("sdl-config --cflags")	65	env.ParseConfig("sdl-config --cflags")
19	env.ParseConfig("freetype-config --cflags --libs")	66	env.ParseConfig("freetype-config --cflags --libs")
Lines 21-27 Link Here
21		68
22	env = config.Finish()	69	env = config.Finish()
23		70
24	@@ -314,7 +311,6 @@ if GetOption('release'):	71	@@ -303,7 +309,6 @@ if GetOption('release'):
25	# Now add release optimizations to the environment	72	# Now add release optimizations to the environment
26	env.Append(	73	env.Append(
27	CPPFLAGS = [	74	CPPFLAGS = [
Lines 29-35 Link Here
29	"-DNDEBUG",	76	"-DNDEBUG",
30	"-DBOOST_DISABLE_ASSERTS"	77	"-DBOOST_DISABLE_ASSERTS"
31	]	78	]
32	@@ -360,13 +356,7 @@ elif GetOption('pprof'):	79	@@ -349,13 +354,7 @@ elif GetOption('pprof'):
33	"profiler"]	80	"profiler"]
34	)	81	)
35	else:	82	else:

Line 0 Link Here

(-)files/patch-site__scons_site_tools_rlvm.py (+25 lines)
	1	--- site_scons/site_tools/rlvm.py.orig 2016-07-30 22:27:57 UTC
	2	+++ site_scons/site_tools/rlvm.py
	3	@@ -56,19 +56,19 @@ def RlvmProgram(env, prog_name, args, *kwargs):
	4	objects.extend(args)
	5
	6	# TODO: Deal with RLVM_LIBS in a shared objecty way
	7	- if kwargs.has_key('rlvm_libs'):
	8	+ if 'rlvm_libs' in kwargs:
	9	for lib_name in kwargs['rlvm_libs']:
	10	objects.append(env['LIBPREFIX'] + lib_name + env['LIBSUFFIX'])
	11
	12	# Add all static libraries from the various categories
	13	- if kwargs.has_key('use_lib_set'):
	14	+ if 'use_lib_set' in kwargs:
	15	for lib_set_name in kwargs['use_lib_set']:
	16	lib_set = cloned_env[_MakeStaticName(lib_set_name)]
	17	if lib_set:
	18	objects.extend(lib_set)
	19
	20	# First, we need to see if this is a static build
	21	- if kwargs.has_key("full_static_build") and kwargs['full_static_build'] == True:
	22	+ if 'full_static_build' in kwargs and kwargs['full_static_build'] == True:
	23	# We must unpack each entry in LIBS and try to locate a static library to
	24	old_libs = cloned_env['LIBS']
	25	libpaths = cloned_env['LIBPATH']