From 6c5b92362f53bc72e40384a49272339b2d29bb68 Mon Sep 17 00:00:00 2001
From: Serge Petrenko <sergepetrenko@tarantool.org>
Date: Tue, 8 Oct 2019 18:49:52 +0300
Subject: [PATCH] build: remove libyaml from rpm/deb dependencies
After we started using bundled version of libyaml by default (see commit
47b91e90f2a4e23e70a1a6735af3de203ffd59f4), we can remove it from
building dependencies for RPM and DEB packages.
Closes #4442
Reviewed-by: Alexander Turenko <alexander.turenko@tarantool.org>
(cherry picked from commit 1d4e584a7b5a5570486d7dfa6df82e664f8e0f95)
---
debian/control | 3 +--
rpm/tarantool.spec | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 91d0b0e445..ea2e151fdb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: cdbs (>= 0.4.100), debhelper (>= 9), dpkg-dev (>= 1.16.1~),
cmake,
libreadline-dev,
libncurses5-dev,
- libyaml-dev,
libssl-dev,
libunwind-dev | libunwind8-dev | libunwind7-dev,
libicu-dev,
@@ -54,7 +53,7 @@ Package: tarantool
Architecture: i386 amd64 armhf arm64
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, binutils, libgomp1,
- libyaml-0-2, openssl, tarantool-common (>= 1.7.5.46),
+ openssl, tarantool-common (>= 1.7.5.46),
# libcurl dependencies (except ones we have already)
zlib1g
Replaces: tarantool-lts
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 10daf14587..b837214a6a 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -15,7 +15,6 @@ BuildRequires: gcc-c++ >= 4.5
BuildRequires: coreutils
BuildRequires: sed
BuildRequires: readline-devel
-BuildRequires: libyaml-devel
BuildRequires: openssl-devel
BuildRequires: libicu-devel
#BuildRequires: msgpuck-devel
--
GitLab