From 421f7efdd3d6fba193be461fba84adbdccaa2ced Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 15 Mar 2014 13:59:02 +0000 Subject: libs/{lua52,luajit}, texk/web2c/{luatexdir,mplibdir,xetexdir}: Minor updates git-svn-id: svn://tug.org/texlive/trunk@33182 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/lua52/ChangeLog | 4 ++ Build/source/libs/lua52/Makefile.am | 2 +- Build/source/libs/lua52/Makefile.in | 2 +- .../libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring | 12 ---- Build/source/libs/lua52/lua-5.2.3/src/lstring.c | 2 +- .../LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c | 65 ---------------------- .../libs/luajit/LuaJIT-2.0.3/src/lib_package.c | 3 - Build/source/libs/luajit/native/Makefile.in | 9 ++- 8 files changed, 11 insertions(+), 88 deletions(-) delete mode 100644 Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-lstring delete mode 100644 Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c (limited to 'Build/source/libs') 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 + + * Makefile.am (AM_CPPFLAGS): Define LUAI_HASHLIMIT=6 for LuaTeX. + 2014-03-03 Peter Breitenlohner * 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 diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c b/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c deleted file mode 100644 index ffc5b039620..00000000000 --- a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-007-lib_package.c +++ /dev/null @@ -1,65 +0,0 @@ -diff -u LuaJIT-2.0.3.orig/src/lib_package.c LuaJIT-2.0.3/src/lib_package.c ---- LuaJIT-2.0.3.orig/src/lib_package.c 2014-03-13 12:38:39.407900526 +0100 -+++ LuaJIT-2.0.3/src/lib_package.c 2014-03-13 13:01:11.283956573 +0100 -@@ -68,6 +68,9 @@ - #elif LJ_TARGET_WINDOWS - - #define WIN32_LEAN_AND_MEAN -+#ifndef WINVER -+#define WINVER 0x0500 -+#endif - #include - - #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS -@@ -354,6 +357,29 @@ - return 1; /* library loaded successfully */ - } - -+#define LUA_POF "luaopen_" -+#define LUA_OFSEP "_" -+#define POF LUA_POF -+ -+static const char *mkfuncname (lua_State *L, const char *modname) { -+ const char *funcname; -+ const char *mark = strchr(modname, *LUA_IGMARK); -+ if (mark) modname = mark + 1; -+ funcname = luaL_gsub(L, modname, ".", LUA_OFSEP); -+ funcname = lua_pushfstring(L, POF"%s", funcname); -+ lua_remove(L, -2); /* remove 'gsub' result */ -+ return funcname; -+} -+ -+ -+int loader_C_luatex (lua_State *L, const char *name, const char *filename) { -+ const char *funcname; -+ funcname = mkfuncname(L, name); -+ if (ll_loadfunc(L, filename, funcname,0) != 0) -+ loaderror(L, filename); -+ return 1; /* library loaded successfully */ -+} -+ - static int lj_cf_package_loader_croot(lua_State *L) - { - const char *filename; -@@ -373,6 +399,21 @@ - return 1; - } - -+int loader_Call_luatex (lua_State *L, const char *name, const char *filename) { -+ const char *funcname; -+ int stat; -+ if (filename == NULL) return 1; /* root not found */ -+ funcname = mkfuncname(L, name); -+ if ((stat = ll_loadfunc(L, filename, funcname,0)) != 0) { -+ if (stat != PACKAGE_ERR_FUNC) loaderror(L, filename); /* real error */ -+ lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, -+ name, filename); -+ return 1; /* function not found */ -+ } -+ return 1; /* library loaded successfully */ -+} -+ -+ - static int lj_cf_package_loader_preload(lua_State *L) - { - const char *name = luaL_checkstring(L, 1); diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c b/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c index 6f3adec85b3..0e4a8ed0641 100644 --- a/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c +++ b/Build/source/libs/luajit/LuaJIT-2.0.3/src/lib_package.c @@ -68,9 +68,6 @@ static const char *ll_bcsym(void *lib, const char *sym) #elif LJ_TARGET_WINDOWS #define WIN32_LEAN_AND_MEAN -#ifndef WINVER -#define WINVER 0x0500 -#endif #include #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS diff --git a/Build/source/libs/luajit/native/Makefile.in b/Build/source/libs/luajit/native/Makefile.in index 0fcb804df74..b0b90971f21 100644 --- a/Build/source/libs/luajit/native/Makefile.in +++ b/Build/source/libs/luajit/native/Makefile.in @@ -116,9 +116,8 @@ buildvm_OBJECTS = $(nodist_buildvm_OBJECTS) buildvm_LDADD = $(LDADD) nodist_minilua_OBJECTS = @LUAJIT_TREE@/src/host/minilua.$(OBJEXT) minilua_OBJECTS = $(nodist_minilua_OBJECTS) -minilua_LDADD = $(LDADD) -minilua_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(minilua_LDFLAGS) \ - $(LDFLAGS) -o $@ +am__DEPENDENCIES_1 = +minilua_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -311,7 +310,7 @@ nodist_buildvm_SOURCES = \ nodist_minilua_SOURCES = \ @LUAJIT_TREE@/src/host/minilua.c -minilua_LDFLAGS = $(MATH_LIB) +minilua_LDADD = $(MATH_LIB) CLEANFILES = buildvm-stamp buildvm_arch.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -398,7 +397,7 @@ buildvm$(EXEEXT): $(buildvm_OBJECTS) $(buildvm_DEPENDENCIES) $(EXTRA_buildvm_DEP minilua$(EXEEXT): $(minilua_OBJECTS) $(minilua_DEPENDENCIES) $(EXTRA_minilua_DEPENDENCIES) @rm -f minilua$(EXEEXT) - $(AM_V_CCLD)$(minilua_LINK) $(minilua_OBJECTS) $(minilua_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(minilua_OBJECTS) $(minilua_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) -- cgit v1.2.3