From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 515CB42F4AE for ; Thu, 18 Jun 2020 08:37:08 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Thu, 18 Jun 2020 08:36:49 +0300 Message-Id: <7b965ee57e3b5854ce5ba50470465bca495aa18a.1592458150.git.avtikhon@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v1 1/4] build: enable bundled libyaml for all systems. List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin , Sergey Bronnikov , Alexander Turenko Cc: tarantool-patches@dev.tarantool.org From: Serge Petrenko 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) --- 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 e8ea5aa13..7d61aa4a5 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 edfecfc33..904eaa719 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 8cd54c090..4b6ea6f9f 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 28429d2e7..b7e586789 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 -- 2.17.1