From d3c979b50b53e80b4321e72b1668cf38773a138e Mon Sep 17 00:00:00 2001
From: Serge Petrenko <sergepetrenko@tarantool.org>
Date: Sun, 21 Jul 2019 14:47:26 +0300
Subject: [PATCH] build: enable bundled libyaml for all systems.

After we fixed bundled libyaml to correctly print 4-byte Unicode
characters, it is no longer compatible with the upstream version, so
enable building with bundled libyaml for every platform.
This way the tests will pass.

Follow-up #4090

(cherry picked from commit 47b91e90f2a4e23e70a1a6735af3de203ffd59f4)

After the app/digest.test.lua and app/socket.test.lua where unblocked
by the commit:

  f5880666227cb86b3119a3557afadb1178a1b809
  commit f5880666227cb86b3119a3557afadb1178a1b809
  Author: Alexander V. Tikhonov <avtikhon@tarantool.org>
  Date:   Sun May 10 09:28:15 2020 +0300

    test: return tests to packaging testing

    Found that issues #1227 and #1322 were closed, returned
    the tests blocked by it into the testing.

    Part of #4599

THe following issue appeared in the both tests:

 [032] --- app/digest.result  Thu May 21 03:21:02 2020
 [032] +++ app/digest.reject  Thu May 21 03:26:47 2020
 [032] @@ -333,7 +333,7 @@
 [032]
 [032]    YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh
 [032]
 [032] -  '
 [032] +'
 [032]  ...
 [032]  digest.base64_decode(b) == s
 [032]  ---
 [032]

Found that the issue was already fixed in the main trunk of Tarantool
2.x version where bundled libyaml was used. To fix the tests in 1.10
version decided to use bundled libyaml too.
---
 apk/APKBUILD       | 2 --
 debian/rules       | 1 -
 rpm/tarantool.spec | 1 -
 snapcraft.yaml     | 1 -
 4 files changed, 5 deletions(-)

diff --git a/apk/APKBUILD b/apk/APKBUILD
index e8ea5aa13523..7d61aa4a51e4 100644
--- a/apk/APKBUILD
+++ b/apk/APKBUILD
@@ -23,10 +23,8 @@ build() {
     cd "$builddir"
 
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DENABLE_BUNDLED_LIBYAML:BOOL=OFF \
           -DENABLE_BACKTRACE:BOOL=ON \
           -DENABLE_DIST:BOOL=ON \
-          -DENABLE_BUNDLED_LIBYAML:BOOL=OFF \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_INSTALL_SYSCONFDIR=/etc \
           -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
diff --git a/debian/rules b/debian/rules
index edfecfc3353c..904eaa719882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
 	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
 	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-	-DENABLE_BUNDLED_LIBYAML=OFF \
 	-DENABLE_DIST=ON \
 	-DWITH_SYSVINIT=ON \
 	-DWITH_SYSTEMD=$(WITH_SYSTEMD)
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 8cd54c090a61..4b6ea6f9f961 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -145,7 +145,6 @@ C and Lua/C modules.
 %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
          -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \
          -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-         -DENABLE_BUNDLED_LIBYAML:BOOL=OFF \
 %if %{with backtrace}
          -DENABLE_BACKTRACE:BOOL=ON \
 %else
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 28429d2e7f01..b7e586789ec5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -25,7 +25,6 @@ parts:
         plugin: cmake
         configflags:
           - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-          - -DENABLE_BUNDLED_LIBYAML=OFF
           - -DENABLE_DIST=OFF # Disable tarantoolctl, init scripts, etc.
         build-packages:
           - cmake