Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package luajit for openSUSE:Factory checked
in at 2021-10-30 23:13:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/luajit (Old)
and /work/SRC/openSUSE:Factory/.luajit.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "luajit"
Sat Oct 30 23:13:21 2021 rev:3 rq:927861
version:2.1.0~beta3+git.1624618403.e9577376
Changes:
--------
--- /work/SRC/openSUSE:Factory/luajit/luajit.changes 2021-10-11
16:48:42.666176827 +0200
+++ /work/SRC/openSUSE:Factory/.luajit.new.1890/luajit.changes 2021-10-30
23:14:30.723092904 +0200
@@ -1,0 +2,16 @@
+Wed Oct 27 20:20:36 UTC 2021 - Fabian Vogt <fv...@suse.com>
+
+- Replace luajit-ppc64-remove-asserts.patch with
+ luajit-ppc64-replace-asserts.patch to use the proper assert
+ functions instead of removing them.
+
+-------------------------------------------------------------------
+Mon Oct 25 21:55:16 UTC 2021 - Michael Gorse <mgo...@suse.com>
+
+- Add luajit-ppc64-remove-asserts.patch: remove calls to
+ lua_assert. Fixes the build with our revision (bsc#1191615).
+- Add luajit-s390x.patch: add s390x support, based on Fedora's
+ patch and ported to our revision.
+- Remove ExcludeArch, since package currently builds on s390x.
+
+-------------------------------------------------------------------
New:
----
luajit-ppc64-replace-asserts.patch
luajit-s390x.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ luajit.spec ++++++
--- /var/tmp/diff_new_pack.lhKWmI/_old 2021-10-30 23:14:31.203093291 +0200
+++ /var/tmp/diff_new_pack.lhKWmI/_new 2021-10-30 23:14:31.203093291 +0200
@@ -30,14 +30,19 @@
Source0: %{name}-%{version}.tar.xz
Source1: baselibs.conf
Patch0: luajit-lua-versioned.patch
-Patch2:
https://salsa.debian.org/lua-team/luajit/-/raw/master/debian/patches/0002-Enable-debugging-symbols-in-the-build.patch
-Patch3:
https://salsa.debian.org/lua-team/luajit/-/raw/master/debian/patches/0003-Get-rid-of-LUAJIT_VERSION_SYM-that-changes-ABI-on-ev.patch
-Patch4:
https://salsa.debian.org/lua-team/luajit/-/raw/master/debian/patches/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
+#
https://salsa.debian.org/lua-team/luajit/-/raw/master/debian/patches/0002-Enable-debugging-symbols-in-the-build.patch
+Patch2: 0002-Enable-debugging-symbols-in-the-build.patch
+#
https://salsa.debian.org/lua-team/luajit/-/raw/master/debian/patches/0003-Get-rid-of-LUAJIT_VERSION_SYM-that-changes-ABI-on-ev.patch
+Patch3: 0003-Get-rid-of-LUAJIT_VERSION_SYM-that-changes-ABI-on-ev.patch
+#
https://salsa.debian.org/lua-team/luajit/-/raw/master/debian/patches/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
+Patch4: 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
+Patch5: luajit-ppc64-replace-asserts.patch
+# Most recent s390x patches at https://github.com/luajit/luajit/pull/631
+Patch6: luajit-s390x.patch
BuildRequires: pkgconfig
Requires: %{name}-%{lib_version}-%{so_version} = %{version}
Obsoletes: lua51-luajit <= 2.2.0
Obsoletes: moonjit <= 2.2.0
-ExcludeArch: s390x
%description
A Just-In-Time Compiler for Lua language
++++++ 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch ++++++
++++ 1053 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/luajit/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
++++ and
/work/SRC/openSUSE:Factory/.luajit.new.1890/0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
++++++ luajit-ppc64-replace-asserts.patch ++++++
Index: luajit-2.1.0~beta3+git.1624618403.e9577376/src/lj_ccallback.c
===================================================================
--- luajit-2.1.0~beta3+git.1624618403.e9577376.orig/src/lj_ccallback.c
+++ luajit-2.1.0~beta3+git.1624618403.e9577376/src/lj_ccallback.c
@@ -216,7 +216,7 @@ static void *callback_mcode_init(global_
*p++ = (uint64_t)vm_toc;
*p++ = (uint64_t)g | ((uint64_t)slot << 47);
}
- lua_assert(p - page <= CALLBACK_MCODE_SIZE / 8);
+ lj_assertG_(g, p - page <= CALLBACK_MCODE_SIZE / 8, "CALLBACK_MCODE_SIZE too
small for CALLBACK_MAX_SLOT");
return p;
}
#else
@@ -227,7 +227,7 @@ static void *callback_mcode_init(global_
MSize slot;
#if LJ_ARCH_PPC_ELFV2
// Needs to be in sync with lj_vm_ffi_callback.
- lua_assert(CALLBACK_MCODE_SIZE == 4096);
+ lj_assertG_(g, CALLBACK_MCODE_SIZE == 4096, "CALLBACK_MCODE_SIZE has
unexpected size");
for (slot = 0; slot < CALLBACK_MAX_SLOT; slot++) {
*p = PPCI_B | (((page+CALLBACK_MAX_SLOT-p) & 0x00ffffffu) << 2);
p++;
++++++ luajit-s390x.patch ++++++
++++ 7397 lines (skipped)
