[packages/mysql] - use system protobuf
qboosh
qboosh at pld-linux.org
Mon Jan 23 20:08:23 CET 2017
commit a485888a40e7a98e15c98b7306215dce3633b6fd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jan 23 20:09:45 2017 +0100
- use system protobuf
mysql.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index f4037c9..6d824ff 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -70,10 +70,9 @@ Patch24: %{name}-cmake.patch
Patch26: %{name}dumpslow-clusters.patch
URL: http://www.mysql.com/products/community/
-BuildRequires: automake
BuildRequires: bison >= 1.875
%{?with_system_boost:BuildRequires: boost-devel >= 1.59.0}
-BuildRequires: cmake >= 2.6
+BuildRequires: cmake >= 2.8.2
BuildRequires: libaio-devel
BuildRequires: libevent-devel
BuildRequires: libhsclient-devel
@@ -85,6 +84,7 @@ BuildRequires: ncurses-devel >= 4.2
%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
BuildRequires: pam-devel
BuildRequires: perl-devel >= 1:5.6.1
+BuildRequires: protobuf-devel >= 2.5
BuildRequires: python-modules
BuildRequires: readline-devel >= 6.2
BuildRequires: rpm-perlprov >= 4.1-13
@@ -520,7 +520,8 @@ CPPFLAGS="%{rpmcppflags}" \
-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
-DWITH_PIC=ON \
-DWITH_LZ4=system \
- -DWITH_LIBEVENT="system" \
+ -DWITH_LIBEVENT=system \
+ -DWITH_PROTOBUF=system \
-DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \
-DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
%{!?with_system_boost:-DWITH_BOOST="$(pwd)/$(ls -1d ../boost_*)"} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/a485888a40e7a98e15c98b7306215dce3633b6fd
More information about the pld-cvs-commit
mailing list