epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --compat=none for Lua 5.1

Browse Source 
Undefines LUA_COMPAT_VARARG, LUA_COMPAT_MOD, LUA_COMPAT_LSTR,
LUA_COMPAT_GFIND, and LUA_COMPAT_OPENLIB before compiling.
This commit is contained in:
mpeterv 2015-12-04 00:29:20 +03:00
parent 5466fca58f
commit 468a7ad8bf
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hererocks.py
View File

@ -288,7 +288,7 @@ class Lua(Program):
luaconf_h.close() luaconf_h.close()
body, _, rest = luaconf_src.rpartition(b"#endif") body, _, rest = luaconf_src.rpartition(b"#endif")
defines = os.linesep.join([ defines = os.linesep.join(self.extra_defines + [
"#undef LUA_PATH_DEFAULT", "#undef LUA_PATH_DEFAULT",
"#undef LUA_CPATH_DEFAULT", "#undef LUA_CPATH_DEFAULT",
"#define LUA_PATH_DEFAULT \"{}\"".format(package_path), "#define LUA_PATH_DEFAULT \"{}\"".format(package_path),
@ -326,8 +326,9 @@ class Lua(Program):
self.fetch() self.fetch()
print("Building " + self.title + self.version_suffix) print("Building " + self.title + self.version_suffix)
self.patch_default_paths() self.extra_defines = []
self.apply_compat() self.apply_compat()
self.patch_default_paths()
self.make() self.make()
if self.cached_build_path is not None: if self.cached_build_path is not None:
@ -362,7 +363,7 @@ class RioLua(Lua):
def set_compat(self): def set_compat(self):
if self.major_version == "5.1": if self.major_version == "5.1":
self.compat = "default" self.compat = "none" if opts.compat == "none" else "default"
elif self.major_version == "5.2": elif self.major_version == "5.2":
self.compat = "none" if opts.compat in ["none", "5.2"] else "default" self.compat = "none" if opts.compat in ["none", "5.2"] else "default"
else: else:
@ -370,7 +371,13 @@ class RioLua(Lua):
def apply_compat(self): def apply_compat(self):
if self.compat != "default": if self.compat != "default":
if self.major_version == "5.2": if self.major_version == "5.1":
if self.compat == "none":
self.extra_defines.extend([
"#undef LUA_COMPAT_VARARG", "#undef LUA_COMPAT_MOD", "#undef LUA_COMPAT_LSTR",
"#undef LUA_COMPAT_GFIND", "#undef LUA_COMPAT_OPENLIB"
])
elif self.major_version == "5.2":
self.patch_build_option(" -DLUA_COMPAT_ALL", "") self.patch_build_option(" -DLUA_COMPAT_ALL", "")
elif self.compat == "none": elif self.compat == "none":
self.patch_build_option(" -DLUA_COMPAT_5_2", "") self.patch_build_option(" -DLUA_COMPAT_5_2", "")