mariadb: 10.2.17 -> 10.3.15

This commit is contained in:
Izorkin 2019-05-19 15:15:32 +03:00
parent c9d2d2fa82
commit a3da901ec7
4 changed files with 24 additions and 17 deletions

View file

@ -0,0 +1,16 @@
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 31291d26..fad52814 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -34,6 +34,11 @@ MACRO(MYSQL_ADD_PLUGIN)
"LINK_LIBRARIES;DEPENDENCIES"
${ARGN}
)
+
+ IF(WITHOUT_SERVER OR ARG_CLIENT)
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+ ENDIF()
+
IF(NOT WITHOUT_SERVER OR ARG_CLIENT)
# Add common include directories

View file

@ -22,14 +22,14 @@ galeraLibs = buildEnv {
};
common = rec { # attributes common to both builds
version = "10.2.17";
version = "10.3.15";
src = fetchurl {
urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7";
sha256 = "0s399nxk2z8fgdr527p64y74zwjc3gpv7psf1n2r6ksl9njr3wr7";
name = "mariadb-${version}.tar.gz";
};
@ -44,7 +44,7 @@ common = rec { # attributes common to both builds
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
'';
patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
patches = [ ./cmake-includedir.patch ]
++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;
cmakeFlags = [
@ -100,6 +100,8 @@ client = stdenv.mkDerivation (common // {
propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc
patches = [ ./cmake-plugin-includedir.patch ];
cmakeFlags = common.cmakeFlags ++ [
"-DWITHOUT_SERVER=ON"
"-DWITH_WSREP=OFF"

View file

@ -1,13 +0,0 @@
diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in
index 45d2f4e..e5666db 100644
--- a/libmariadb/mariadb_config/mariadb_config.c.in
+++ b/libmariadb/mariadb_config/mariadb_config.c.in
@@ -5,7 +5,7 @@
static char *mariadb_progname;
-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql"
#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
#define CFLAGS INCLUDE

View file

@ -14358,7 +14358,9 @@ in
mariadb = callPackage ../servers/sql/mariadb {
asio = asio_1_10;
jemalloc = jemalloc.override ({ disableInitExecTls = true; });
# As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
# https://jira.mariadb.org/browse/MDEV-15034
jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
inherit (darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
};