Commit graph

14 commits

Author SHA1 Message Date
Sergei Golubchik
b760a69e1a Merge branch 'merge-pcre' into 10.0 2016-06-21 16:44:03 +02:00
Sergei Golubchik
1592fbd332 8.39 2016-06-21 16:02:35 +02:00
Vladislav Vaintroub
1694d81399 MDEV-8533 Debug embedded server does not build on Windows
pre/CMakeLists.txt defines CMAKE_DEBUG_POSTFIX which causes a different
library name on Windows debug build (pcred.lib rather than pre.lib)
However MERGE_LIBRARIES macro that is used to create static embedded
library (out of other static libraries), can  not handle per-configuration
library names. Thus the build fails with "pre.lib not found"

Fix is to remove unnecessary CMAKE_DEBUG_POSTFIX
2015-11-09 12:29:26 +01:00
Sergei Golubchik
29065d502a MDEV-6149 Include file pcre.h missing in binary dist, meaing I_S plugins can't be built
when the bundled pcre is used, install its pcre.h in mysql/private/
2014-06-05 15:59:25 +02:00
Sergei Golubchik
8958f8b823 pcre-8.34 2014-06-05 12:47:55 +02:00
Alexander Barkov
74cca64155 Upgrading the bundled PCRE to 8.34 2014-02-03 08:54:12 +04:00
Alexander Barkov
032dc20541 MDEV-4425 Regexp enhancements
Mark a few PCRE CMake variables as advanced,
so the are not presented in cmake-gui by default.
2013-10-11 08:52:24 +04:00
Alexander Barkov
f37e0a885a MDEV-4425 Regexp enhancements
PCRE unit tests failed on Ubuntu Precise, because "source" 
is not a known command in "dash" (the default shell in Precise).

Changing "source" to ".", which should be understood in all shells.
2013-10-03 10:58:41 +04:00
Alexander Barkov
bf41088491 MDEV-4424 Regexp enhancements
- Commenting out unused instructions in pcre/CMakeLists.txt
- Don't print PCRE configuration status by default.
2013-10-02 09:55:57 +04:00
Alexander Barkov
ccb1344fe9 pcre: removing CMake-2.8 requirement.
It seems to compile/work fine with CMake-2.6.
2013-10-01 12:26:34 +04:00
Alexander Barkov
61a1c03694 pcre: fixing linking error one some systems:
libmysqld.a(pcre_exec.c.o): relocation R_X86_64_32S against
`_pcre_ucd_stage1' can not be used when making a shared object;
make[2]: Leaving directory `/mnt/buildbot/build/mariadb-10.0.3'
recompile with -fPIC

Changing ADD_LIBRARY(pcre) to ADD_CONVENIENCE_LIBRARY(pcre)
2013-09-30 11:29:32 +04:00
Alexander Barkov
d88c752612 Removing configuration switches that are not needed for MariaDB
from pcre/CMakeLists.txt
2013-09-27 18:13:46 +04:00
Alexander Barkov
69a641a500 pcre:
- do not install anything from pcre library
- do not build the c++ library
2013-09-27 17:04:30 +04:00
Alexander Barkov
285e7aa179 MDEV-4425 REGEXP enhancements 2013-09-26 18:02:17 +04:00