From: Serge Petrenko <sergepetrenko@tarantool.org> To: alexander.turenko@tarantool.org Cc: tarantool-patches@freelists.org, Serge Petrenko <sergepetrenko@tarantool.org> Subject: [tarantool-patches] [PATCH] build: enable bundled libyaml for all systems. Date: Sun, 21 Jul 2019 16:25:57 +0300 [thread overview] Message-ID: <20190721132557.4519-1-sergepetrenko@tarantool.org> (raw) 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 --- https://github.com/tarantool/tarantool/issues/4090 https://github.com/tarantool/tarantool/tree/sp/gh-4090-enable-bundled-libyaml-full-ci apk/APKBUILD | 2 -- cmake/BuildLibYAML.cmake | 2 +- debian/rules | 1 - rpm/tarantool.spec | 1 - snapcraft.yaml | 1 - 5 files changed, 1 insertion(+), 6 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/cmake/BuildLibYAML.cmake b/cmake/BuildLibYAML.cmake index 7caa1828c..95068d73a 100644 --- a/cmake/BuildLibYAML.cmake +++ b/cmake/BuildLibYAML.cmake @@ -6,7 +6,7 @@ macro(libyaml_build) add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/libyaml EXCLUDE_FROM_ALL) # See comments in BuildLibEV.cmake - set_target_properties(yaml PROPERTIES COMPILE_FLAGS "-w") + set_target_properties(yaml PROPERTIES COMPILE_FLAGS "-w -std=c99") find_package_message(LIBYAML "Using bundled libyaml" 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 8bee71ed0..002df26b1 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -124,7 +124,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 a7ce540cb..48b32a890 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.20.1 (Apple Git-117)
next reply other threads:[~2019-07-21 13:26 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-21 13:25 Serge Petrenko [this message] 2019-07-22 7:09 ` [tarantool-patches] " Alexander Turenko 2019-07-22 21:48 ` [tarantool-patches] Re[2]: " Sergey Petrenko 2019-07-23 9:40 ` [tarantool-patches] " Alexander Turenko 2019-07-23 18:25 ` [tarantool-patches] " Sergey Petrenko 2019-07-24 8:03 ` Alexander Turenko
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=20190721132557.4519-1-sergepetrenko@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH] 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