From 6b851b86a20818981e28962a7ac2a0764b21b2d4 Mon Sep 17 00:00:00 2001
From: Feodor Alexandrov <feodor.alex.alexandrov@gmail.com>
Date: Wed, 29 Nov 2023 14:59:56 +0300
Subject: [PATCH] fix: BAD_COPY_PASTE
---
Makefile | 2 ++
.../svace_patches/luajit_minilua.patch | 13 +++++++++++++
sbroad | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 certification_patches/svace_patches/luajit_minilua.patch
diff --git a/Makefile b/Makefile
index 574ce26f9e..e41964cc75 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ reset-submodules:
tarantool-patch:
echo "${VER_TNT}" > tarantool-sys/VERSION
+ PATCH_DIR=$(pwd)/certification_patches/svace_patches
+ (cd tarantool-sys/third_party/luajit; find ${PATCH_DIR} -name "luajit_*" | xargs -n 1 git apply)
build: tarantool-patch
. ~/.cargo/env && \
diff --git a/certification_patches/svace_patches/luajit_minilua.patch b/certification_patches/svace_patches/luajit_minilua.patch
new file mode 100644
index 0000000000..2566ca4869
--- /dev/null
+++ b/certification_patches/svace_patches/luajit_minilua.patch
@@ -0,0 +1,13 @@
+diff --git a/src/host/minilua.c b/src/host/minilua.c
+index 79150286..33b5ab51 100644
+--- a/src/host/minilua.c
++++ b/src/host/minilua.c
+@@ -4327,7 +4327,7 @@ if(lh->v.u.s.info==v->u.s.info){
+ conflict=1;
+ lh->v.u.s.info=extra;
+ }
+-if(lh->v.u.s.aux==v->u.s.info){
++if(lh->v.u.s.aux==v->u.s.aux){
+ conflict=1;
+ lh->v.u.s.aux=extra;
+ }
diff --git a/sbroad b/sbroad
index c4c658d77d..e2b6207d15 160000
--- a/sbroad
+++ b/sbroad
@@ -1 +1 @@
-Subproject commit c4c658d77d147d6653d28173b2d0ad35f6781dbc
+Subproject commit e2b6207d15aa8ec6eacbdeb25b5c53dde000a1e1
--
GitLab