From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: Kirill Yukhin <kyukhin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org>, Alexander Turenko <alexander.turenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 1/4] build: enable bundled libyaml for all systems. Date: Thu, 18 Jun 2020 08:36:49 +0300 [thread overview] Message-ID: <7b965ee57e3b5854ce5ba50470465bca495aa18a.1592458150.git.avtikhon@tarantool.org> (raw) In-Reply-To: <cover.1592458150.git.avtikhon@tarantool.org> In-Reply-To: <cover.1592458150.git.avtikhon@tarantool.org> From: Serge Petrenko <sergepetrenko@tarantool.org> 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
next prev parent reply other threads:[~2020-06-18 5:37 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-18 5:36 [Tarantool-patches] [PATCH v1 0/4] Fix app/digest and app/socket on 1.10 Alexander V. Tikhonov 2020-06-18 5:36 ` Alexander V. Tikhonov [this message] 2020-06-18 5:36 ` [Tarantool-patches] [PATCH v1 2/4] build: remove libyaml from rpm/deb dependencies Alexander V. Tikhonov 2020-06-18 5:36 ` [Tarantool-patches] [PATCH v1 3/4] Bump libyaml Alexander V. Tikhonov 2020-06-18 5:36 ` [Tarantool-patches] [PATCH v1 4/4] Extend range of printable unicode characters Alexander V. Tikhonov 2020-06-18 10:39 ` [Tarantool-patches] [PATCH v1 0/4] Fix app/digest and app/socket on 1.10 Alexander Turenko 2020-06-22 13:58 ` Alexander V. Tikhonov 2020-06-23 14:08 ` Alexander Turenko 2020-06-26 9:46 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=7b965ee57e3b5854ce5ba50470465bca495aa18a.1592458150.git.avtikhon@tarantool.org \ --to=avtikhon@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=kyukhin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 1/4] build: enable bundled libyaml for all systems.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox