Skip to content

Commit

Permalink
build: enable bundled libyaml for all systems.
Browse files Browse the repository at this point in the history
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 47b91e9)

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

  f588066
  commit f588066
  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.
  • Loading branch information
sergepetrenko authored and avtikhon committed Jun 23, 2020
1 parent e7fea78 commit d3c979b
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 5 deletions.
2 changes: 0 additions & 2 deletions apk/APKBUILD
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion debian/rules
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion rpm/tarantool.spec
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion snapcraft.yaml
Expand Up @@ -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
Expand Down

0 comments on commit d3c979b

Please sign in to comment.