[packages/percona-server] without system boost bcond

glen glen at pld-linux.org
Mon Jun 20 09:07:07 CEST 2016


commit 3578ae01dd663dd0579598fee2a6151bba208480
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 20 10:06:15 2016 +0300

    without system boost bcond
    
    so that can at least build it locally

 percona-server.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/percona-server.spec b/percona-server.spec
index fd52ab3..9d1ecdc 100644
--- a/percona-server.spec
+++ b/percona-server.spec
@@ -24,6 +24,7 @@
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
 %bcond_without	sphinx		# Sphinx storage engine support
 %bcond_without	tokudb		# TokuDB
+%bcond_without	system_boost	# Use system boost package
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
@@ -94,7 +95,7 @@ BuildRequires:	libstdc++4-devel >= 5:4.0
 BuildRequires:	libstdc++-devel >= 5:4.0
 %endif
 BuildRequires:	automake
-BuildRequires:	boost-devel = 1.59.0
+%{?with_system_boost:BuildRequires:	boost-devel = 1.59.0}
 BuildRequires:	libhsclient-devel
 %{?with_tcpd:BuildRequires:	libwrap-devel}
 BuildRequires:	ncurses-devel >= 4.2
@@ -562,6 +563,9 @@ CPPFLAGS="%{rpmcppflags}" \
 	-DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \
 %endif
 	-DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
+%if %{without system_boost}
+	-DDOWNLOAD_BOOST=1 -DWITH_BOOST=$(pwd)/boost \
+%endif
 	-DWITH_ZLIB=system \
 	-DWITH_READLINE=system
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/3578ae01dd663dd0579598fee2a6151bba208480



More information about the pld-cvs-commit mailing list