This commit is contained in:
Tom Callaway 2014-12-10 16:58:46 -05:00
parent 2d3f788d04
commit 95be6bf074
3 changed files with 40 additions and 8 deletions

View File

@ -0,0 +1,12 @@
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 */

View File

@ -1,18 +1,22 @@
%global major_version 5.2
Name: lua
Version: %{major_version}.2
Release: 5%{?dist}
Version: %{major_version}.3
Release: 1%{?dist}
Summary: Powerful light-weight programming language
Group: Development/Languages
License: MIT
URL: http://www.lua.org/
Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz
Patch0: %{name}-%{version}-autotoolize.patch
Patch1: %{name}-%{version}-idsize.patch
Patch2: %{name}-%{version}-luac-shared-link-fix.patch
Patch3: %{name}-%{version}-configure-linux.patch
Patch4: %{name}-%{version}-configure-compat-module.patch
# copied from doc/readme.html on 2014-07-18
Source1: mit.txt
Patch0: %{name}-5.2.2-autotoolize.patch
Patch1: %{name}-5.2.2-idsize.patch
Patch2: %{name}-5.2.2-luac-shared-link-fix.patch
Patch3: %{name}-5.2.2-configure-linux.patch
Patch4: %{name}-5.2.2-configure-compat-module.patch
# http://www.lua.org/bugs.html
Patch5: lua-5.2.3-ephemeronfix.patch
BuildRequires: automake autoconf libtool readline-devel ncurses-devel
Provides: lua(abi) = %{major_version}
@ -46,12 +50,14 @@ This package contains the static version of liblua for %{name}.
%prep
%setup -q
cp %{SOURCE1} .
mv src/luaconf.h src/luaconf.h.template.in
%patch0 -p1 -E -z .autoxxx
%patch1 -p1 -z .idsize
%patch2 -p1 -z .luac-shared
%patch3 -p1 -z .configure-linux
%patch4 -p1 -z .configure-compat-all
%patch5 -p1 -b .ephemeronfix
autoreconf -i
@ -75,6 +81,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
%files
%{!?_licensedir:%global license %%doc}
%license mit.txt
%doc README doc/*.html doc/*.css doc/*.gif doc/*.png
%{_bindir}/lua
%{_bindir}/luac
@ -96,6 +104,18 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
%changelog
* Wed Dec 10 2014 Tom Callaway <spot@fedoraproject.org> - 5.2.3-1
- update to 5.2.3
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Jul 18 2014 Tom Callaway <spot@fedoraproject.org> - 5.2.2-7
- fix license handling
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Oct 23 2013 Tom Callaway <spot@fedoraproject.org> - 5.2.2-5
- readd and fix configure-compat-module.patch to use LUA_CONFIG_ALL instead

View File

@ -1 +1 @@
efbb645e897eae37cad4344ce8b0a614 lua-5.2.2.tar.gz
dc7f94ec6ff15c985d2d6ad0f1b35654 lua-5.2.3.tar.gz