ported to 5.2 - Release fields start at 5 to be newer the compat-lua-libs from the non-compat lua packageepel8
Hans de Goede
12 years ago
parent
e8ddaa8ab7
commit
ed24aed43d
@ -0,0 +1 @@
|
||||
/lua-5.1.4.tar.gz
|
||||
@ -0,0 +1,109 @@
|
||||
Name: compat-lua
|
||||
Version: 5.1.4
|
||||
Release: 5%{?dist}
|
||||
Summary: Powerful light-weight programming language (compat version)
|
||||
Group: Development/Languages
|
||||
License: MIT
|
||||
URL: http://www.lua.org/
|
||||
Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz
|
||||
Patch0: lua-5.1.4-autotoolize.patch
|
||||
Patch1: lua-5.1.4-lunatic.patch
|
||||
Patch2: lua-5.1.4-idsize.patch
|
||||
Patch3: lua-5.1.4-2.patch
|
||||
Patch4: lua-5.1.4-pc-compat.patch
|
||||
BuildRequires: readline-devel ncurses-devel libtool
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Provides: lua = 5.1
|
||||
|
||||
%description
|
||||
This package contains a compatibility version of the lua-5.1 binaries.
|
||||
|
||||
|
||||
%package libs
|
||||
Summary: Powerful light-weight programming language (compat version)
|
||||
Provides: lua(abi) = 5.1
|
||||
|
||||
%description libs
|
||||
This package contains a compatibility version of the lua-5.1 libraries.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains development files for compat-lua-libs.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n lua-%{version}
|
||||
%patch0 -p1 -E -z .autoxxx
|
||||
%patch1 -p0 -z .lunatic
|
||||
%patch2 -p1 -z .idsize
|
||||
%patch3 -p0 -d src -z .bugfix2
|
||||
%patch4 -p1
|
||||
# fix perms on auto files
|
||||
chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
|
||||
# Avoid make doing auto-reconf itself, killing our rpath removel in the process
|
||||
autoreconf -i -f
|
||||
|
||||
|
||||
%build
|
||||
%configure --with-readline
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
# hack so that only /usr/bin/lua gets linked with readline as it is the
|
||||
# only one which needs this and otherwise we get License troubles
|
||||
make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl"
|
||||
# also remove readline from lua.pc
|
||||
sed -i 's/-lreadline -lncurses //g' etc/lua.pc
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/liblua.{a,la}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/5.1
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/5.1
|
||||
# Rename some files to avoid conflicts with 5.2
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/lua $RPM_BUILD_ROOT%{_bindir}/lua-5.1
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/luac $RPM_BUILD_ROOT%{_bindir}/luac-5.1
|
||||
mv $RPM_BUILD_ROOT%{_mandir}/man1/lua.1 \
|
||||
$RPM_BUILD_ROOT%{_mandir}/man1/lua-5.1.1
|
||||
mv $RPM_BUILD_ROOT%{_mandir}/man1/luac.1 \
|
||||
$RPM_BUILD_ROOT%{_mandir}/man1/luac-5.1.1
|
||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}/lua-5.1
|
||||
mv $RPM_BUILD_ROOT%{_includedir}/l*h* $RPM_BUILD_ROOT%{_includedir}/lua-5.1
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/liblua.so
|
||||
mv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/lua.pc \
|
||||
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/lua-5.1.pc
|
||||
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%{_bindir}/lua-5.1
|
||||
%{_bindir}/luac-5.1
|
||||
%{_mandir}/man1/lua*5.1.1*
|
||||
|
||||
%files libs
|
||||
%doc COPYRIGHT HISTORY README doc/*.html doc/*.css doc/*.gif doc/*.png
|
||||
%{_libdir}/liblua-5.1.so
|
||||
%dir %{_libdir}/lua
|
||||
%dir %{_libdir}/lua/5.1
|
||||
%dir %{_datadir}/lua
|
||||
%dir %{_datadir}/lua/5.1
|
||||
|
||||
%files devel
|
||||
%{_includedir}/lua-5.1/
|
||||
%{_libdir}/pkgconfig/lua-5.1.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Aug 3 2013 Hans de Goede <hdegoede@redhat.com> - 5.1.4-5
|
||||
- New Fedora package with full lua-5.1 for use with applications not yet
|
||||
ported to 5.2
|
||||
- Release fields start at 5 to be newer the compat-lua-libs from the
|
||||
non-compat lua package
|
||||
@ -0,0 +1,195 @@
|
||||
# patch-lua-5.1.4-2 created 2010-05-14T21:02:40-0300
|
||||
# apply to a pristine copy of Lua 5.1.4 with:
|
||||
# wget http://www.lua.org/ftp/lua-5.1.4.tar.gz
|
||||
# tar zxf lua-5.1.4.tar.gz
|
||||
# cd lua-5.1.4/src
|
||||
# wget http://www.lua.org/ftp/patch-lua-5.1.4-2
|
||||
# patch < patch-lua-5.1.4-2
|
||||
# use curl -O -R if you don't have wget
|
||||
|
||||
--- lcode.c 2007/12/28 15:32:23 2.25.1.3
|
||||
+++ lcode.c 2009/06/15 14:12:25 2.25.1.4
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
|
||||
+** $Id: lcode.c,v 2.25.1.4 2009/06/15 14:12:25 roberto Exp $
|
||||
** Code generator for Lua
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@@ -544,15 +544,18 @@
|
||||
pc = NO_JUMP; /* always true; do nothing */
|
||||
break;
|
||||
}
|
||||
- case VFALSE: {
|
||||
- pc = luaK_jump(fs); /* always jump */
|
||||
- break;
|
||||
- }
|
||||
case VJMP: {
|
||||
invertjump(fs, e);
|
||||
pc = e->u.s.info;
|
||||
break;
|
||||
}
|
||||
+ case VFALSE: {
|
||||
+ if (!hasjumps(e)) {
|
||||
+ pc = luaK_jump(fs); /* always jump */
|
||||
+ break;
|
||||
+ }
|
||||
+ /* else go through */
|
||||
+ }
|
||||
default: {
|
||||
pc = jumponcond(fs, e, 0);
|
||||
break;
|
||||
@@ -572,14 +575,17 @@
|
||||
pc = NO_JUMP; /* always false; do nothing */
|
||||
break;
|
||||
}
|
||||
- case VTRUE: {
|
||||
- pc = luaK_jump(fs); /* always jump */
|
||||
- break;
|
||||
- }
|
||||
case VJMP: {
|
||||
pc = e->u.s.info;
|
||||
break;
|
||||
}
|
||||
+ case VTRUE: {
|
||||
+ if (!hasjumps(e)) {
|
||||
+ pc = luaK_jump(fs); /* always jump */
|
||||
+ break;
|
||||
+ }
|
||||
+ /* else go through */
|
||||
+ }
|
||||
default: {
|
||||
pc = jumponcond(fs, e, 1);
|
||||
break;
|
||||
--- ldblib.c 2008/01/21 13:11:21 1.104.1.3
|
||||
+++ ldblib.c 2009/08/04 18:50:18 1.104.1.4
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
|
||||
+** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
|
||||
** Interface from Lua to its debug API
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@@ -45,6 +45,7 @@
|
||||
|
||||
|
||||
static int db_getfenv (lua_State *L) {
|
||||
+ luaL_checkany(L, 1);
|
||||
lua_getfenv(L, 1);
|
||||
return 1;
|
||||
}
|
||||
--- liolib.c 2008/01/18 17:47:43 2.73.1.3
|
||||
+++ liolib.c 2010/05/14 15:33:51 2.73.1.4
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
|
||||
+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
|
||||
** Standard I/O (and system) library
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@@ -276,7 +276,10 @@
|
||||
lua_pushnumber(L, d);
|
||||
return 1;
|
||||
}
|
||||
- else return 0; /* read fails */
|
||||
+ else {
|
||||
+ lua_pushnil(L); /* "result" to be removed */
|
||||
+ return 0; /* read fails */
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
--- llex.c 2007/12/27 13:02:25 2.20.1.1
|
||||
+++ llex.c 2009/11/23 14:58:22 2.20.1.2
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
|
||||
+** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
|
||||
** Lexical Analyzer
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@@ -118,8 +118,10 @@
|
||||
lua_State *L = ls->L;
|
||||
TString *ts = luaS_newlstr(L, str, l);
|
||||
TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */
|
||||
- if (ttisnil(o))
|
||||
+ if (ttisnil(o)) {
|
||||
setbvalue(o, 1); /* make sure `str' will not be collected */
|
||||
+ luaC_checkGC(L);
|
||||
+ }
|
||||
return ts;
|
||||
}
|
||||
|
||||
--- loadlib.c 2008/08/06 13:29:28 1.52.1.3
|
||||
+++ loadlib.c 2009/09/09 13:17:16 1.52.1.4
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
|
||||
+** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
|
||||
** Dynamic library loader for Lua
|
||||
** See Copyright Notice in lua.h
|
||||
**
|
||||
@@ -639,7 +639,7 @@
|
||||
lua_pushvalue(L, -1);
|
||||
lua_replace(L, LUA_ENVIRONINDEX);
|
||||
/* create `loaders' table */
|
||||
- lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
|
||||
+ lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
|
||||
/* fill it with pre-defined loaders */
|
||||
for (i=0; loaders[i] != NULL; i++) {
|
||||
lua_pushcfunction(L, loaders[i]);
|
||||
--- lstrlib.c 2008/07/11 17:27:21 1.132.1.4
|
||||
+++ lstrlib.c 2010/05/14 15:34:19 1.132.1.5
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
|
||||
+** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
|
||||
** Standard library for string operations and pattern-matching
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@@ -754,6 +754,7 @@
|
||||
|
||||
|
||||
static int str_format (lua_State *L) {
|
||||
+ int top = lua_gettop(L);
|
||||
int arg = 1;
|
||||
size_t sfl;
|
||||
const char *strfrmt = luaL_checklstring(L, arg, &sfl);
|
||||
@@ -768,7 +769,8 @@
|
||||
else { /* format item */
|
||||
char form[MAX_FORMAT]; /* to store the format (`%...') */
|
||||
char buff[MAX_ITEM]; /* to store the formatted item */
|
||||
- arg++;
|
||||
+ if (++arg > top)
|
||||
+ luaL_argerror(L, arg, "no value");
|
||||
strfrmt = scanformat(L, strfrmt, form);
|
||||
switch (*strfrmt++) {
|
||||
case 'c': {
|
||||
--- lvm.c 2007/12/28 15:32:23 2.63.1.3
|
||||
+++ lvm.c 2009/07/01 21:10:33 2.63.1.4
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
|
||||
+** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
|
||||
** Lua virtual machine
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@@ -133,6 +133,7 @@
|
||||
|
||||
void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
|
||||
int loop;
|
||||
+ TValue temp;
|
||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||
const TValue *tm;
|
||||
if (ttistable(t)) { /* `t' is a table? */
|
||||
@@ -152,7 +153,9 @@
|
||||
callTM(L, tm, t, key, val);
|
||||
return;
|
||||
}
|
||||
- t = tm; /* else repeat with `tm' */
|
||||
+ /* else repeat with `tm' */
|
||||
+ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */
|
||||
+ t = &temp;
|
||||
}
|
||||
luaG_runerror(L, "loop in settable");
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,12 @@
|
||||
diff -urN lua-5.1.4/src/luaconf.h.template.in lua-5.1.4.idsize/src/luaconf.h.template.in
|
||||
--- lua-5.1.4/src/luaconf.h.template.in 2011-01-28 19:18:03.176584291 +0100
|
||||
+++ lua-5.1.4.idsize/src/luaconf.h.template.in 2011-01-28 19:19:26.581213131 +0100
|
||||
@@ -216,7 +216,7 @@
|
||||
@* of a function in debug information.
|
||||
** CHANGE it if you want a different size.
|
||||
*/
|
||||
-#define LUA_IDSIZE 60
|
||||
+#define LUA_IDSIZE 512
|
||||
|
||||
|
||||
/*
|
||||
@ -0,0 +1,11 @@
|
||||
--- src/loadlib.c.orig 2010-02-09 16:58:47.000000000 -0600
|
||||
+++ src/loadlib.c 2010-02-09 16:59:12.000000000 -0600
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
|
||||
static void *ll_load (lua_State *L, const char *path) {
|
||||
- void *lib = dlopen(path, RTLD_NOW);
|
||||
+ void *lib = dlopen(path, RTLD_NOW|RTLD_GLOBAL);
|
||||
if (lib == NULL) lua_pushstring(L, dlerror());
|
||||
return lib;
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
--- lua-5.1.4/etc/lua.pc.in~ 2013-08-03 12:01:51.000000000 +0200
|
||||
+++ lua-5.1.4/etc/lua.pc.in 2013-08-03 12:03:24.788963457 +0200
|
||||
@@ -9,5 +9,5 @@ Name: Lua
|
||||
Description: An Extensible Extension Language
|
||||
Version: ${R}
|
||||
Requires:
|
||||
-Libs: -llua @LUA_LIBS@
|
||||
-Cflags: -I${includedir}
|
||||
+Libs: -llua-5.1 @LUA_LIBS@
|
||||
+Cflags: -I${includedir}/lua-5.1
|
||||
Loading…
Reference in new issue