Update upstream to mariadb 10.2.14 #14
Conversation
fritzm
force-pushed
the
tickets/DM-12397
branch
from
ed6a267
to
a3331b8
Compare
fritzm
force-pushed
the
tickets/DM-12397
branch
from
a3331b8
to
39a5967
Compare
fritzm
force-pushed
the
tickets/DM-12397
branch
from
39a5967
to
b2ddf31
Compare
| # Due to cmake library discovery being overly energetic (searching every | ||
| # lib directory relative to each entry in $PATH) we use the bundled ZLIB and | ||
| # PCRE libraries to avoid link confusion downstream | ||
| ARGS+=('-DWITH_ZLIB=bundled') |
There was a problem hiding this comment.
The commit message isn't really clear about this ZLIB change.
There was a problem hiding this comment.
Oh. It was part of "Streamline eupspkg.cfg to be more similar with mariadbclient version", but it certainly wouldn't hurt to be more explicit; will fix.
Still losing on OSX, BTW :-/ For some reason, -DWITH_SSL=off doesn't seem to bypass the failing GnuTLS check, though it seems by my first reading of the cmake file that it should. Installing GnuTLS via homebrew "fixes" it, but I don't think we want to add another prereq if we can avoid it. I'll continue to fiddle with it...
fritzm
changed the title
fritzm
force-pushed
the
tickets/DM-12397
branch
from
047378d
to
3be1ad6
Compare
fritzm
force-pushed
the
tickets/DM-12397
branch
from
3be1ad6
to
446ea05
Compare
fritzm
changed the title
| ARGS+=('-DWITH_PCRE=bundled') | ||
|
|
||
| # Prevent CMake from finding and linking against libraries distributed in $(dirname | ||
| # python)/../lib. This is CMake's default behaviour, but can cause us to erroneously link | ||
| # python)/../lib. This is CMake's default behavior, but can cause us to erroneously link |
There was a problem hiding this comment.
Really? English spelling is not acceptable to you? 😛
ups/eupspkg.cfg.sh
Outdated
| @@ -13,35 +13,17 @@ config() | |||
| # TokuDB requires third-party software jemalloci (see http://www.canonware.com/jemalloc/) | |||
| ARGS+=('-DPLUGIN_TOKUDB=NO') | |||
|
|
|||
| # Always use bundled PCRE | |||
| # Due to cmake library discovery being overly energetic (searching every | |||
| # lib directory relative to each entry in $PATH) we use the bundled SSL and | |||
There was a problem hiding this comment.
This mention of SSL is no longer correct, and the mention of PCRE was removed from the comment but it's still here.
| ARGS+=('-DWITH_PCRE=bundled') | ||
|
|
||
| # Prevent CMake from finding and linking against libraries distributed in $(dirname | ||
| # python)/../lib. This is CMake's default behaviour, but can cause us to erroneously link | ||
| # python)/../lib. This is CMake's default behavior, but can cause us to erroneously link | ||
| # against libraries distributed by e.g. Anaconda. | ||
| PYTHONLIBDIR=$(which python | sed -e's|bin/python|lib|') | ||
| ARGS+=("-DCMAKE_SYSTEM_IGNORE_PATH=${PYTHONLIBDIR}") |
There was a problem hiding this comment.
I have the same question here as on lsst-dm/legacy-mariadbclient#12
Make eupspkg.cfg.sh consisted with the one in mariadbclient to the greatest extent possible to avoid inadvertent inconsistent options between these two packages. New configuration uses bundled ZLIB and PCRE, and system SSL. SSL is no longer optional for MariaDB; MacOS users may, for example, "brew install gnutls" to satisfy this dependency.
No description provided.