diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-15 13:59:02 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-15 13:59:02 +0000 |
commit | 421f7efdd3d6fba193be461fba84adbdccaa2ced (patch) | |
tree | dd8db3f5f47211af551f45fd0b29dd0683265b8c /Build/source/libs/lua52 | |
parent | 8dbe4b451fb55cabfd1f42b4df30e13069aa6e75 (diff) |
libs/{lua52,luajit}, texk/web2c/{luatexdir,mplibdir,xetexdir}: Minor updates
git-svn-id: svn://tug.org/texlive/trunk@33182 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/lua52')
-rw-r--r-- | Build/source/libs/lua52/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring | 12 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lstring.c | 2 |
5 files changed, 7 insertions, 15 deletions
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog index 97cb5ff06e8..c639f54482a 100644 --- a/Build/source/libs/lua52/ChangeLog +++ b/Build/source/libs/lua52/ChangeLog @@ -1,3 +1,7 @@ +2014-03-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (AM_CPPFLAGS): Define LUAI_HASHLIMIT=6 for LuaTeX. + 2014-03-03 Peter Breitenlohner <peb@mppmu.mpg.de> * luaerror.test (new): Shell script to test error handling. diff --git a/Build/source/libs/lua52/Makefile.am b/Build/source/libs/lua52/Makefile.am index e8ef2795699..7b53e991372 100644 --- a/Build/source/libs/lua52/Makefile.am +++ b/Build/source/libs/lua52/Makefile.am @@ -22,7 +22,7 @@ dist-hook: SUBDIRS = . include -AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) -DLUAI_HASHLIMIT=6 AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = liblua52.a diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in index c7a26f2e7a3..e85871336dd 100644 --- a/Build/source/libs/lua52/Makefile.in +++ b/Build/source/libs/lua52/Makefile.in @@ -577,7 +577,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES error.exp SUBDIRS = . include -AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) -DLUAI_HASHLIMIT=6 AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = liblua52.a nodist_liblua52_a_SOURCES = \ diff --git a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring b/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring deleted file mode 100644 index c42fb67edfa..00000000000 --- a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur lua-5.2.3.orig/src/lstring.c lua-5.2.3/src/lstring.c ---- lua-5.2.3.orig/src/lstring.c2014-03-06 15:04:50.376201110 +0100 -+++ lua-5.2.3/src/lstring.c2014-03-03 16:55:19.978037000 +0100 -@@ -23,7 +23,7 @@ - ** compute its hash - */ - #if !defined(LUAI_HASHLIMIT) --#define LUAI_HASHLIMIT 5 -+#define LUAI_HASHLIMIT 6 - #endif - - diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstring.c b/Build/source/libs/lua52/lua-5.2.3/src/lstring.c index f438915a50d..af96c89c183 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lstring.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lstring.c @@ -23,7 +23,7 @@ ** compute its hash */ #if !defined(LUAI_HASHLIMIT) -#define LUAI_HASHLIMIT 6 +#define LUAI_HASHLIMIT 5 #endif |