Commit af45c558 authored by Richard Bachmann's avatar Richard Bachmann
Browse files

Resolve SPI-1490 "Update mysql"

parent 271a1ab9
......@@ -17,7 +17,8 @@ else
fi
slc_check(){
readelf --debug-dump "$1" 2> /dev/null
# Output size is limited to prevent lon DWARF sections from eating all the memory and crashing
readelf --debug-dump=info --dwarf-depth=1 "$1" 2> /dev/null
}
mac_check(){
......
......@@ -284,6 +284,8 @@ LCG_external_package(lapack 3.8.0
LCG_external_package(lazy_object_proxy 1.3.1 )
LCG_external_package(lcov 1.14 )
LCG_external_package(libaio 0.3.110-1 )
LCG_external_package(libedit 3.1 )
LCG_external_package(libevent 2.1.11 )
LCG_external_package(libffi 3.2.1 )
LCG_external_package(libgeotiff 1.5.1 )
LCG_external_package(libgit2 0.28.2 )
......@@ -324,8 +326,9 @@ LCG_external_package(mpfi 1.5.3
LCG_external_package(mpfr 4.0.2 )
LCG_external_package(mpmath 1.1.0 )
LCG_external_package(msgpack 0.6.1 )
LCG_external_package(msgpackc 3.2.0 )
LCG_external_package(multiprocess 0.70.9 )
LCG_external_package(mysql 5.7.26 )
LCG_external_package(mysql 10.4.10 )
LCG_external_package(nanomsg 1.1.5 )
LCG_external_package(nbconvert 5.5.0 )
LCG_external_package(nbformat 4.4.0 )
......@@ -530,7 +533,7 @@ LCG_external_package(xqilla 2.3.3
LCG_external_package(xrootd 4.10.0 )
LCG_external_package(xz 5.0.4 )
LCG_external_package(yamlcpp 0.6.2 )
LCG_external_package(zeromq 4.3.1 )
LCG_external_package(zeromq 4.3.2 )
LCG_external_package(zict 0.1.4 )
LCG_external_package(zipp 0.5.1 )
LCG_external_package(zlib 1.2.11 )
......
#---define here the packages to be taken from the shystem for this OS and version
if(${LCG_OS}${LCG_OSVERS} STREQUAL centos7 AND NOT ${LCG_ARCH} STREQUAL i686)
set(LCG_system_packages bzip2 xz uuid curl motif jpeg glib gmp)
set(LCG_system_packages bzip2 xz uuid curl motif jpeg glib gmp libedit libevent)
elseif(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
set(LCG_system_packages uuid curl motif jpeg)
set(LCG_system_packages uuid curl motif jpeg libedit libevent)
elseif(${LCG_OS}${LCG_OSVERS} STREQUAL ubuntu1604)
set(LCG_system_packages bzip2 xz uuid curl motif pkg_config jpeg )
set(LCG_system_packages bzip2 xz uuid curl motif pkg_config jpeg libedit libevent)
elseif(${LCG_OS}${LCG_OSVERS} STREQUAL ubuntu1804)
set(LCG_system_packages bzip2 xz uuid curl motif pkg_config zlib jpeg glib flex bison m4 gmp)
set(LCG_system_packages bzip2 xz uuid curl motif pkg_config zlib jpeg glib flex bison m4 gmp libedit libevent)
elseif(${LCG_OS}${LCG_OSVERS} STREQUAL mac1014)
......
......@@ -40,15 +40,20 @@
"name": "glog"
},
{
"category": null,
"contacts": [],
"description": null,
"fullname": "",
"homepage": null,
"language": null,
"license": null,
"category": null,
"contacts": [
{
"email": "https://github.com/lz4/lz4/issues",
"name": "Github issue tracker"
}
],
"description": "LZ4 is lossless compression algorithm, providing compression speed > 500 MB/s per core (>0.15 Bytes/cycle).",
"fullname": "",
"homepage": "https://lz4.github.io/lz4/",
"language": "C",
"license": "BSD2c and GPLv2",
"name": "lz4"
},
},
{
"category": null,
"contacts": [],
......@@ -1563,13 +1568,13 @@
"name": "minuit"
},
{
"category": null,
"category": "Tool",
"contacts": [],
"description": "a SQL database management system",
"description": "MariaDB Server is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source.",
"fullname": "mysql",
"homepage": "http://www.mysql.com/",
"language": "Python",
"license": "GPL",
"homepage": "https://mariadb.org/",
"language": "C++",
"license": "GPL2",
"name": "mysql"
},
{
......@@ -7567,5 +7572,50 @@
"language": "C++",
"license": "http://zlib.net/zlib_license.html",
"name": "zlib"
},
{
"category": "Tool",
"contacts": [
{
"email": "https://archives.seul.org/libevent/users/",
"name": "Libevent mailing list subscription instructions"
}
],
"description": "The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached.",
"fullname": "libevent",
"homepage": "https://libevent.org/",
"language": "C",
"license": "BSD3c",
"name": "libevent"
},
{
"category": "Tool",
"contacts": [
{
"email": "https://github.com/msgpack/msgpack-c",
"name": "https://github.com/msgpack/msgpack-c"
}
],
"description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller. This implementation is for C/C++.",
"fullname": "msgpack-c",
"homepage": "https://msgpack.org/",
"language": "C++",
"license": "BOOST",
"name": "msgpackc"
},
{
"category": "Tool",
"contacts": [
{
"email": "jess@thrysoee.dk",
"name": "Jess Thrysoee"
}
],
"description": "This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline.",
"fullname": "Editline Library",
"homepage": "https://thrysoee.dk/editline/",
"language": "C++",
"license": "BSD3c",
"name": "libedit"
}
]
\ No newline at end of file
]
......@@ -1387,17 +1387,79 @@ LCGPackage_Add(
DEPENDS bison
)
#---libevent--------------------------------------------------------------------------------------------------
LCGPackage_Add(
libevent
URL ${GenURL}/libevent-${libevent_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR>
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---libedit---------------------------------------------------------------------------------------------------
LCGPackage_Add(
libedit
URL ${GenURL}/libedit-${libedit_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix <INSTALL_DIR>
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
)
#---libsodium-------------------------------------------------------------------------------------------------
LCGPackage_Add(
libsodium
URL ${GenURL}/libsodium-${libsodium_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
BUILD_IN_SOURCE 1
)
#---zeromq----------------------------------------------------------------------------------------------------
LCGPackage_Add(
zeromq
URL ${GenURL}/libzmq-${zeromq_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DWITH_PERF_TOOL=OFF
-DZMQ_BUILD_TESTS=OFF
-DWITH_LIBSODIUM=ON
DEPENDS libsodium
)
#---msgpackc----------------------------------------------------------------------------------------------------
LCGPackage_Add(
msgpackc
URL ${GenURL}/msgpack-c-cpp-${msgpackc_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
)
#----lz4-----------------------------------------------------------------------
LCGPackage_Add(
lz4
URL ${GenURL}/lz4-${lz4_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install PREFIX=<INSTALL_DIR>
BUILD_IN_SOURCE 1
)
#---mysql-----------------------------------------------------------------------------------------------------
# The opensource fork of MySQL is now known as MariaDB. It will continue to be referred to as MySQL here.
LCGPackage_Add(
mysql
URL ${GenURL}/mysql-${mysql_native_version}.tar.gz
URL ${GenURL}/mariadb-${mysql_native_version}.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DENABLE_DTRACE=0
-DDOWNLOAD_BOOST=1
-DWITH_BOOST=<SOURCE_DIR>/boost
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DMYSQL_MAINTAINER_MODE=OFF
DEPENDS zlib curl bison
IF LCG_COMP MATCHES clang THEN
-DPLUGIN_TOKUDB=NO
ENDIF
DEPENDS Boost bison jemalloc libevent zlib libxml2 libedit lz4 zeromq msgpackc
)
#---doxygen----------------------------------------------------------------------------------------------
......@@ -1658,23 +1720,6 @@ LCGPackage_Add(
DEPENDS Python
)
#---libsodium----------------------------------------------------------------------
LCGPackage_Add(
libsodium
URL ${GenURL}/libsodium-${libsodium_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
BUILD_IN_SOURCE 1
)
#---zeromq----------------------------------------------------------------------
LCGPackage_Add(
zeromq
URL ${GenURL}/zeromq-${zeromq_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --with-libsodium=yes
BUILD_IN_SOURCE 1
DEPENDS libsodium pkg_config
)
#----autoconf-------------------------------------------------------------------
LCGPackage_Add(
autoconf
......@@ -2565,16 +2610,6 @@ LCGPackage_Add(
-DRAPIDJSON_BUILD_TESTS=OFF
)
#----lz4-----------------------------------------------------------------------
LCGPackage_Add(
lz4
URL ${GenURL}/lz4-${lz4_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install PREFIX=<INSTALL_DIR>
BUILD_IN_SOURCE 1
)
#---thrift---------------------------------------------------------------------
LCGPackage_Add(
thrift
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment