diff --git a/.gitignore b/.gitignore index ea11c29..7697d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ lua-5.1.4/ /lua-5.2.2.tar.gz /lua-5.2.3.tar.gz /lua-5.3.0.tar.gz +/lua-5.3.2-tests.tar.gz +/lua-5.3.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index ccef9af..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: lua -# $Id$ -NAME := lua -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/STAGE2-lua b/STAGE2-lua deleted file mode 100644 index 75460ac..0000000 --- a/STAGE2-lua +++ /dev/null @@ -1,8 +0,0 @@ -#requires readline - -mcd $BUILDDIR/lua - -$SRC/lua-*/configure $TCONFIGARGS --with-compat-module - -make $J LIBS="-lm -ldl -lreadline" luac_LDADD="liblua.la -lm -ldl -lreadline" -make $J install diff --git a/lua-5.2.2-autotoolize.patch b/lua-5.2.2-autotoolize.patch deleted file mode 100644 index 19df17c..0000000 --- a/lua-5.2.2-autotoolize.patch +++ /dev/null @@ -1,204 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -new file mode 100644 -index 0000000..8d968c4 ---- /dev/null -+++ b/Makefile.am -@@ -0,0 +1,3 @@ -+SUBDIRS = src doc -+ -+EXTRA_DIST = README -diff --git a/configure.ac b/configure.ac -new file mode 100644 -index 0000000..3af6625 ---- /dev/null -+++ b/configure.ac -@@ -0,0 +1,69 @@ -+AC_PREREQ(2.59) -+AC_INIT([lua], [5.2.2], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org]) -+AC_SUBST([MAJOR_VERSION], [5.2]) -+ -+AC_CONFIG_HEADERS([config.h]) -+AC_CONFIG_SRCDIR([src/lapi.c]) -+ -+AM_INIT_AUTOMAKE([1.9 foreign]) -+ -+AC_PROG_CC -+AC_PROG_LIBTOOL -+ -+AC_ARG_WITH( -+ [readline], -+ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])], -+ [use_readline=$withval], -+ [use_readline=yes] -+) -+ -+LUA_LIBS="-lm" -+ -+# Check for readline -+READLINE_DEFS="#undef LUA_USE_READLINE" -+if test "x$use_readline" == "xyes"; then -+ AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses]) -+ AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no]) -+ if test "x$use_readline" == "xno"; then -+ AC_MSG_WARN([readline headers could not be found, disabling readline support]) -+ else -+ READLINE_DEFS="#define LUA_USE_READLINE" -+ READLINE_LIBS="-lreadline -lncurses" -+ fi -+fi -+AC_SUBST(READLINE_DEFS) -+AC_SUBST(READLINE_LIBS) -+ -+case "$host" in -+ *-mingw*) use_os=win32 ;; -+ *-darwin*) use_os=macosx ;; -+ *) use_os=posix ;; -+esac -+ -+POSIX_DEFS="#undef LUA_USE_POSIX" -+LUA_DL_DEFS="#undef LUA_USE_DLOPEN" -+LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL" -+ -+if test "x$use_os" == "xwin32"; then -+ LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL" -+elif test "x$use_os" == "xmacosx"; then -+ POSIX_DEFS="#define LUA_USE_POSIX" -+ LUA_DL_DEFS="#define LUA_DL_DYLD" -+elif test "x$use_os" == "xposix"; then -+ POSIX_DEFS="#define LUA_USE_POSIX" -+ LUA_DL_DEFS="#define LUA_DL_DLOPEN" -+ LUA_LIBS="$LUA_LIBS -ldl" -+fi -+AC_SUBST(POSIX_DEFS) -+AC_SUBST(LUA_DL_DEFS) -+AC_SUBST(LUA_BUILD_AS_DLL_DEFS) -+ -+AC_SUBST(LUA_LIBS) -+ -+AC_CONFIG_FILES([Makefile -+ src/Makefile -+ src/lua.pc -+ src/luaconf.h.template -+ doc/Makefile -+]) -+AC_OUTPUT -diff --git a/doc/Makefile.am b/doc/Makefile.am -new file mode 100644 -index 0000000..3705696 ---- /dev/null -+++ b/doc/Makefile.am -@@ -0,0 +1,4 @@ -+man1_MANS = lua.1 luac.1 -+ -+EXTRA_DIST = \ -+ contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html -diff --git a/src/.gitignore b/src/.gitignore -new file mode 100644 -index 0000000..0abd9dd ---- /dev/null -+++ b/src/.gitignore -@@ -0,0 +1,5 @@ -+lua -+lua.pc -+luac -+luaconf.h -+luaconf.h.template -diff --git a/src/Makefile.am b/src/Makefile.am -new file mode 100644 -index 0000000..6c7c79f ---- /dev/null -+++ b/src/Makefile.am -@@ -0,0 +1,46 @@ -+AM_CFLAGS = -Wall -+ -+include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp -+ -+nodist_include_HEADERS = luaconf.h -+ -+lib_LTLIBRARIES = liblua.la -+liblua_la_LDFLAGS = -release @MAJOR_VERSION@ -+liblua_la_SOURCES = \ -+ lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \ -+ ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \ -+ loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \ -+ ltable.c ltablib.c ltm.c lundump.c lvm.c lzio.c \ -+ lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \ -+ lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \ -+ lundump.h lvm.h lzio.h -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = lua.pc -+ -+bin_PROGRAMS = lua luac -+ -+lua_SOURCES = lua.c -+lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@ -+lua_DEPENDENCIES = liblua.la -+ -+luac_SOURCES = luac.c -+# Statically link liblua against luac since luac uses symbols not exported in liblua -+luac_LDADD = .libs/liblua.a @LUA_LIBS@ -+luac_DEPENDENCIES = liblua.la -+ -+EXTRA_DIST = luaconf.h.template -+BUILT_SOURCES = luaconf.h -+CLEANFILES = luaconf.h luaconf.h.template -+ -+readline_defs = @READLINE_DEFS@ -+ -+edit = sed \ -+ -e 's,%prefix%,$(prefix),g' \ -+ -e 's,%lua_datadir%,$(datadir),g' \ -+ -e 's,%lua_libdir%,$(libdir),g' -+ -+luaconf.h : luaconf.h.template -+ rm -f $@ $@.tmp -+ $(edit) $< >$@.tmp -+ mv $@.tmp $@ -diff --git a/src/lua.pc.in b/src/lua.pc.in -new file mode 100644 -index 0000000..25faa8d ---- /dev/null -+++ b/src/lua.pc.in -@@ -0,0 +1,13 @@ -+V= @MAJOR_VERSION@ -+R= @VERSION@ -+prefix= @prefix@ -+exec_prefix=${prefix} -+libdir= @libdir@ -+includedir=${prefix}/include -+ -+Name: Lua -+Description: An Extensible Extension Language -+Version: ${R} -+Requires: -+Libs: -llua @LUA_LIBS@ -+Cflags: -I${includedir} -diff --git a/src/luaconf.h b/src/luaconf.h.template.in ---- a/src/luaconf.h.template.in -+++ b/src/luaconf.h.template.in -@@ -11,6 +11,11 @@ - #include - #include - -+@POSIX_DEFS@ -+@LUA_DL_DEFS@ -+@LUA_BUILD_AS_DLL_DEFS@ -+@READLINE_DEFS@ -+ - - /* - ** ================================================================== -@@ -100,9 +105,9 @@ - #else /* }{ */ - - #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" --#define LUA_ROOT "/usr/local/" --#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR --#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR -+#define LUA_ROOT "@prefix@/" -+#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR -+#define LUA_CDIR "@libdir@/lua/" LUA_VDIR - #define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua" diff --git a/lua-5.2.3-ephemeronfix.patch b/lua-5.2.3-ephemeronfix.patch deleted file mode 100644 index b9dbd7b..0000000 --- a/lua-5.2.3-ephemeronfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up lua-5.2.3/src/lgc.c.ephemeronfix lua-5.2.3/src/lgc.c ---- lua-5.2.3/src/lgc.c.ephemeronfix 2014-12-10 16:15:14.482402404 -0500 -+++ lua-5.2.3/src/lgc.c 2014-12-10 16:15:49.715167635 -0500 -@@ -403,7 +403,7 @@ static int traverseephemeron (global_Sta - reallymarkobject(g, gcvalue(gval(n))); /* mark it now */ - } - } -- if (prop) -+ if (g->gcstate != GCSatomic || prop) - linktable(h, &g->ephemeron); /* have to propagate again */ - else if (hasclears) /* does table have white keys? */ - linktable(h, &g->allweak); /* may have to clean white keys */ diff --git a/lua-5.3.0-luac-shared-link-fix.patch b/lua-5.3.0-luac-shared-link-fix.patch deleted file mode 100644 index b65e7f0..0000000 --- a/lua-5.3.0-luac-shared-link-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up lua-5.3.0/src/lopcodes.c.luac-shared lua-5.3.0/src/lopcodes.c ---- lua-5.3.0/src/lopcodes.c.luac-shared 2015-01-05 08:48:33.000000000 -0500 -+++ lua-5.3.0/src/lopcodes.c 2015-01-15 10:24:16.014509744 -0500 -@@ -17,7 +17,7 @@ - - /* ORDER OP */ - --LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = { -+LUA_API const char *const luaP_opnames[NUM_OPCODES+1] = { - "MOVE", - "LOADK", - "LOADKX", -@@ -71,7 +71,7 @@ LUAI_DDEF const char *const luaP_opnames - - #define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m)) - --LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = { -+LUA_API const lu_byte luaP_opmodes[NUM_OPCODES] = { - /* T A B C mode opcode */ - opmode(0, 1, OpArgR, OpArgN, iABC) /* OP_MOVE */ - ,opmode(0, 1, OpArgK, OpArgN, iABx) /* OP_LOADK */ -diff -up lua-5.3.0/src/lopcodes.h.luac-shared lua-5.3.0/src/lopcodes.h ---- lua-5.3.0/src/lopcodes.h.luac-shared 2014-10-25 07:50:46.000000000 -0400 -+++ lua-5.3.0/src/lopcodes.h 2015-01-15 10:24:16.015509738 -0500 -@@ -276,7 +276,7 @@ enum OpArgMask { - OpArgK /* argument is a constant or register/constant */ - }; - --LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES]; -+LUA_API const lu_byte luaP_opmodes[NUM_OPCODES]; - - #define getOpMode(m) (cast(enum OpMode, luaP_opmodes[m] & 3)) - #define getBMode(m) (cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3)) -@@ -285,7 +285,7 @@ LUAI_DDEC const lu_byte luaP_opmodes[NUM - #define testTMode(m) (luaP_opmodes[m] & (1 << 7)) - - --LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ -+LUA_API const char *const luaP_opnames[NUM_OPCODES+1]; /* opcode names */ - - - /* number of list items to accumulate before a SETLIST instruction */ -diff -up lua-5.3.0/src/lundump.h.luac-shared lua-5.3.0/src/lundump.h ---- lua-5.3.0/src/lundump.h.luac-shared 2015-01-15 10:24:16.015509738 -0500 -+++ lua-5.3.0/src/lundump.h 2015-01-15 10:25:12.651209770 -0500 -@@ -27,7 +27,7 @@ LUAI_FUNC LClosure* luaU_undump (lua_Sta - const char* name); - - /* dump one chunk; from ldump.c */ --LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, -+LUA_API int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, - void* data, int strip); - - #endif diff --git a/lua.spec b/lua.spec index fb26ae4..f11831d 100644 --- a/lua.spec +++ b/lua.spec @@ -182,7 +182,6 @@ popd %changelog * Fri Dec 11 2015 "D. Johnson" - 5.3.2-1 - Update to 5.3.2 (#1039249,1173984) -- Added upstream test suite to verify build * Wed Jun 17 2015 Fedora Release Engineering - 5.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 10a2d7c..5cab315 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ dc7f94ec6ff15c985d2d6ad0f1b35654 lua-5.2.3.tar.gz -a1b0a7e92d0c85bbff7a8d27bf29f8af lua-5.3.0.tar.gz +a2b7ab1b8ff82a0145376e233ef30a4a lua-5.3.2-tests.tar.gz +33278c2ab5ee3c1a875be8d55c1ca2a1 lua-5.3.2.tar.gz