Skip to content

Commit

Permalink
Update upstream to mariadb 10.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
fritzm committed Oct 31, 2017
1 parent 14a0f55 commit a3331b8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
15 changes: 0 additions & 15 deletions patches/el5-asm-compat.patch

This file was deleted.

15 changes: 7 additions & 8 deletions ups/eupspkg.cfg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ 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 ZLIB and
# PCRE libraries to avoid link confusion downstream
ARGS+=('-DWITH_ZLIB=bundled')
ARGS+=('-DWITH_PCRE=bundled')

# Prevent CMake from finding and linking against libraries distributed in $(dirname
Expand All @@ -24,13 +27,9 @@ config()

case $(uname) in
Linux*)
if grep -q -i "CentOS release 5" /etc/redhat-release; then
# mroonga does not build on EL5 (conda ref platform) and is
# unused by LSST
ARGS+=('-DPLUGIN_MROONGA=NO')
# required to build on EL5
ARGS+=('-DHAVE_CXX_NEW=NO')
fi
# Use system SSL on Linux to workaround miniconda
# downrev version conflict
ARGS+=('-DWITH_SSL=yes')
;;
Darwin*)
# Disable external SSL on OS X as it is not a standard library
Expand Down
Binary file not shown.

0 comments on commit a3331b8

Please sign in to comment.