summaryrefslogtreecommitdiff
path: root/lang/tolua++/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tolua++/files')
-rw-r--r--lang/tolua++/files/patch-SConstruct41
-rw-r--r--lang/tolua++/files/patch-src-lib-SCsub16
-rw-r--r--lang/tolua++/files/patch-src-tests-SCsub9
3 files changed, 66 insertions, 0 deletions
diff --git a/lang/tolua++/files/patch-SConstruct b/lang/tolua++/files/patch-SConstruct
new file mode 100644
index 000000000000..f0856026d593
--- /dev/null
+++ b/lang/tolua++/files/patch-SConstruct
@@ -0,0 +1,41 @@
+--- SConstruct.orig 2008-04-21 00:05:35 UTC
++++ SConstruct
+@@ -7,21 +7,22 @@ if os.name == 'nt':
+
+ env = Environment(tools = tools)
+
+-options_file = None
++variables_file = None
+ if sys.platform == 'linux2':
+- options_file = "linux"
++ variables_file = "linux"
+
+ elif 'msvc' in env['TOOLS']:
+- options_file = "msvc"
++ variables_file = "msvc"
+ else:
+- options_file = "posix"
++ variables_file = "posix"
+
+-opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS)
++opts = Variables(["config_"+variables_file+".py", "custom.py", "custom_"+variables_file+".py"], ARGUMENTS)
+ opts.Add('CC', 'The C compiler.')
+ opts.Add('CXX', 'The C++ compiler (for the tests)')
+ opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
+ opts.Add('LINK', 'The linker.')
+ opts.Add('LINKFLAGS', 'Linker flags.', [])
++opts.Add('SONAME', 'Shared library name.')
+ opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0)
+ opts.Add('LIBS', 'libraries', [])
+ opts.Add('LIBPATH', 'library path', [])
+@@ -145,7 +146,9 @@ Files will be installed on <prefix>/bin,
+ ########### end of helper builders
+
+ env['CPPPATH'] = '#/include'
+-env['LIBPATH'] = ['#/lib'] + env['LIBPATH']
++env['LIBPATH'] = ['#/lib'] + env['LIBPATH'].split(" ")
++
++env.Append(SHLINKFLAGS=' -Wl,-soname='+env['SONAME'])
+
+ if env['no_cygwin']:
+
diff --git a/lang/tolua++/files/patch-src-lib-SCsub b/lang/tolua++/files/patch-src-lib-SCsub
new file mode 100644
index 000000000000..ffa68d40fa0b
--- /dev/null
+++ b/lang/tolua++/files/patch-src-lib-SCsub
@@ -0,0 +1,16 @@
+--- src/lib/SCsub.orig 2008-04-21 00:05:35 UTC
++++ src/lib/SCsub
+@@ -9,10 +9,7 @@ sources = [
+ 'tolua_to.c',
+ ]
+
+-env.lib_target_static = env.Library('#/lib/'+env['tolua_lib']+'_static', sources)
+-
+-if env['shared']:
+- env.lib_target = env.SharedLibrary('#lib/'+env['tolua_lib'], sources)
+-else:
+- env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
++env.lib_target_static = env.Library('#/lib/'+env['tolua_lib'], sources)
++env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
++env.lib_target += env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
+
diff --git a/lang/tolua++/files/patch-src-tests-SCsub b/lang/tolua++/files/patch-src-tests-SCsub
new file mode 100644
index 000000000000..446b0af4fd25
--- /dev/null
+++ b/lang/tolua++/files/patch-src-tests-SCsub
@@ -0,0 +1,9 @@
+--- src/tests/SCsub.orig 2006-04-10 09:45:44 UTC
++++ src/tests/SCsub
+@@ -1,5 +1,5 @@
+ Import('env')
+-env_tests = env.Copy()
++env_tests = env.Clone()
+
+ env_tests.LuaBinding('tclassbind.cpp', 'tclass.pkg', 'tclass', use_own=1, use_typeid=1)
+