rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Require correct version of pcre library

Browse Source
This commit is contained in:
Honza Horak 2014-07-21 10:29:11 +02:00
parent 8a019a0a24
commit 0879ad208d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mariadb.spec
View File

@ -26,6 +26,14 @@
# (Fedora 22?) # (Fedora 22?)
%bcond_without mysqld_unit %bcond_without mysqld_unit
# MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use
# the bundled library, since the package cannot be build with older version
%if 0%{?fedora} >= 21
%bcond_without pcre
%else
%bcond_with pcre
%endif
# use Full RELRO for all binaries (RHBZ#1092548) # use Full RELRO for all binaries (RHBZ#1092548)
%global _hardened_build 1 %global _hardened_build 1
@ -107,6 +115,7 @@ BuildRequires: time procps
BuildRequires: pam-devel BuildRequires: pam-devel
# boost and Judy required for oograph # boost and Judy required for oograph
%{?with_oqgraph:BuildRequires: boost-devel, Judy-devel} %{?with_oqgraph:BuildRequires: boost-devel, Judy-devel}
%{?with_pcre:BuildRequires: pcre-devel >= 8.35}
# perl modules needed to run regression tests # perl modules needed to run regression tests
BuildRequires: perl(Socket), perl(Time::HiRes) BuildRequires: perl(Socket), perl(Time::HiRes)
BuildRequires: perl(Data::Dumper), perl(Test::More), perl(Env) BuildRequires: perl(Data::Dumper), perl(Test::More), perl(Env)
@ -421,7 +430,7 @@ cmake . -DBUILD_CONFIG=mysql_release \
-DWITH_READLINE=ON \ -DWITH_READLINE=ON \
-DWITH_SSL=system \ -DWITH_SSL=system \
-DWITH_ZLIB=system \ -DWITH_ZLIB=system \
-DWITH_PCRE=system \ %{?with_pcre: -DWITH_PCRE=system}\
-DWITH_JEMALLOC=no \ -DWITH_JEMALLOC=no \
%{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\ %{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\
-DTMPDIR=%{_localstatedir}/tmp \ -DTMPDIR=%{_localstatedir}/tmp \