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
  • Loading branch information
sergepetrenko authored and avtikhon committed Dec 11, 2019
1 parent 91e2a96 commit 6389b0c
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 @@ -142,7 +142,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 6389b0c

Please sign in to comment.