diff --git a/Makefile b/Makefile index 574ce26f9edeba5303bd99c14740146f486f7382..e41964cc75fc8587b1734742066923f3bb8bdde7 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 0000000000000000000000000000000000000000..2566ca4869b6425a30ea33295d00b40572aa58c2 --- /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 c4c658d77d147d6653d28173b2d0ad35f6781dbc..e2b6207d15aa8ec6eacbdeb25b5c53dde000a1e1 160000 --- a/sbroad +++ b/sbroad @@ -1 +1 @@ -Subproject commit c4c658d77d147d6653d28173b2d0ad35f6781dbc +Subproject commit e2b6207d15aa8ec6eacbdeb25b5c53dde000a1e1