Accepting request 821623 from home:Andreas_Schwab:Factory

- files_test.patch: use proper check for 64-bit time_t
- Amend list of 64bit architectures

OBS-URL: https://build.opensuse.org/request/show/821623
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=4
This commit is contained in:
Callum Farmer 2020-07-18 09:21:15 +00:00 committed by Git OBS Bridge
parent b7456e8ef1
commit e6741c1ceb
3 changed files with 15 additions and 23 deletions

View File

@ -1,5 +1,7 @@
--- a/lua-5.4.0-tests/files.lua
+++ b/lua-5.4.0-tests/files.lua
Index: lua-5.4.0/lua-5.4.0-tests/files.lua
===================================================================
--- lua-5.4.0.orig/lua-5.4.0-tests/files.lua
+++ lua-5.4.0/lua-5.4.0-tests/files.lua
@@ -81,7 +81,7 @@ assert(io.output() ~= io.stdout)
if not _port then -- invalid seek
@ -36,28 +38,12 @@
_G.D = os.date("*t", t)
assert(os.time(D) == t)
load(os.date([[assert(D.year==%Y and D.month==%m and D.day==%d and
@@ -784,6 +788,15 @@ local function checkDateTable (t)
_G.D = nil
end
+local function is64bit()
+ local arch = io.popen("uname -m"):read("*a")
+ if (arch or ""):match("64") then
+ return 64
+ else
+ return 32
+ end
+end
+
checkDateTable(os.time())
if not _port then
-- assume that time_t can represent these values
@@ -791,7 +804,9 @@ if not _port then
@@ -791,7 +795,9 @@ if not _port then
checkDateTable(1)
checkDateTable(1000)
checkDateTable(0x7fffffff)
- checkDateTable(0x80000000)
+ if is64bit() == 64 then
+ if not testerr("out-of-bound", os.date, "*t", 0x80000000) then
+ checkDateTable(0x80000000)
+ end
end

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jul 18 08:59:50 UTC 2020 - Andreas Schwab <schwab@suse.de>
- files_test.patch: use proper check for 64-bit time_t
- Amend list of 64bit architectures
-------------------------------------------------------------------
Mon Jul 6 21:20:00 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -24,7 +24,7 @@ Release: 0
Summary: Small Embeddable Language with Procedural Syntax
License: MIT
Group: Development/Languages/Other
Url: http://www.lua.org
URL: http://www.lua.org
Source: http://www.lua.org/ftp/lua-5.4.0.tar.gz
Source1: http://www.lua.org/tests/lua-5.4.0-tests.tar.gz
Source99: baselibs.conf
@ -78,9 +78,9 @@ application.
%package -n %{libname}
Summary: The Lua integration library
# Compat as libtool changes the soname
Group: System/Libraries
%ifarch aarch64 x86_64 ppc64 ppc64le s390x
# Compat as libtool changes the soname
%ifarch aarch64 x86_64 ppc64 ppc64le s390x riscv64
Provides: liblua.so.5.4()(64bit)
%else
Provides: liblua.so.5.4