Skip to content
Snippets Groups Projects
Commit 5deeca06 authored by Dmitry Rodionov's avatar Dmitry Rodionov
Browse files

Pick up stat analysis patches made for 23.12 and 2.11.0

This patch combines patches from these two picodata/tarantool fork branches:
https://git.picodata.io/picodata/tarantool/-/tree/dynamic-linking-from-system?ref_type=heads
https://git.picodata.io/picodata/picodata/picodata/-/tree/svace-fixes?ref_type=heads

Previously patches for tarantool were made for 2.11.0 so for 2.11.2 (version we currently use)
some of them had to be updated.

Patches from b124e8f01fafb98bc3005f77b8852d1f699f8666 initially were committed
to fork repo but for manageability it was decided that its easier to support
those via patch files. So these changes are added to existing patches in
certification_patches dir.

Then follow changes from 6b851b86
and 2be2aab5. Patch application is
currently concentrated in gitlab-ci.yml. 6b851b moved svace patches
application to tarantool's makefile. For now its easier to keep it
in one place. Svace patches from previous commit are moved into
subdirectory. Patches that touch supplementary files or simply remove
them are removed and the list of the files is kept for later to form a
dedicated list of files for deletion.

Conflicting were picked from f98334ea.
Redundant patch for curl libssh was removed because the same change
appeared upstream https://github.com/curl/curl/pull/11088/files



Luagdb patch was updated.
OSCP response patch as well as icu_common_exec patch were removed,
since original files are not needed in the build process and thus are
deleted from the repo.

Lastly patch application is moved to dedicated python script for
ease of sharing with vm builder repo.

Co-authored-by: default avatarFeodor Alexandrov <feodor.alex.alexandrov@gmail.com>
parent 6882134a
1 merge request!846Pick up stat analysis patches made for 23.12 and 2.11.0
Checking pipeline status
Showing
with 23 additions and 32 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment