diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2013-06-23 16:35:44 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2013-06-23 16:35:44 -0400 |
| commit | ab6143c46668b7cbf31223f9d9cff71e332e6f36 (patch) | |
| tree | 019f804a2c2a7a7bdd5cc5b63547f593ee534ff3 | |
| parent | af82b24dc04d604958bd4dcd56994d114d94fa32 (diff) | |
Reverted to lfs 1.6.0 since later versions break the LuaJIT version.
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/lfs.patch | 18 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 64e0c91e..025e28b9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -419,7 +419,7 @@ scinterm_zip = scinterm.zip scintillua_zip = scintillua.zip lua_tgz = lua-5.2.2.tar.gz lpeg_tgz = lpeg-0.10.2.tar.gz -lfs_zip = 5e55437028cc03d79c5a3cddce0cf8aecd0de2be.zip +lfs_zip = d71c63cdb776f7d25313f8fcd14f07512ba1f83e.zip luajit_tgz = LuaJIT-2.0.2.tar.gz libluajit_tgz = libluajit_2.0.2.x86_64.tgz gtdialog_zip = gtdialog.zip @@ -456,8 +456,9 @@ lua: lua.patch | $(lua_tgz) lualibs: lua/src/lib/lpeg lua/src/lib/lfs lua/src/lib/lpeg: | $(lpeg_tgz) mkdir -p $@ && tar xzf $| -C $@ && mv $@/*/*.c $@/*/*.h $(dir $@) -lua/src/lib/lfs: | $(lfs_zip) +lua/src/lib/lfs: lfs.patch | $(lfs_zip) mkdir -p $@ && unzip -d $@ $| && mv $@/*/src/*.c $@/*/src/*.h $(dir $@) + patch -d $(dir $@) -N -p1 < $< $(luajit_tgz): ; wget "http://luajit.org/download/$@" luajit: luajit.patch | $(luajit_tgz) mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@ diff --git a/src/lfs.patch b/src/lfs.patch new file mode 100644 index 00000000..2beb43f0 --- /dev/null +++ b/src/lfs.patch @@ -0,0 +1,18 @@ +--- a/lfs.c 2013-06-23 16:19:35.884341424 -0400 ++++ b/lfs.c 2013-06-23 16:19:49.028452052 -0400 +@@ -877,15 +877,6 @@ + {NULL, NULL}, + }; + +-#if LUA_VERSION_NUM > 501 +-static void luaL_register (lua_State *L, const char *libname, const luaL_Reg *l) +-{ +- luaL_newlib (L, l); +- lua_pushvalue (L, -1); +- lua_setglobal (L, libname); +-} +-#endif +- + int luaopen_lfs (lua_State *L) { + dir_create_meta (L); + lock_create_meta (L); |