version up: MariaDB 10.4.12

component/mariadb/buildout.cfg

@@ -29,8 +29,8 @@ parts =
 [mariadb]
 recipe = slapos.recipe.cmmi
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
-version = 10.3.22
-md5sum = f712a5e6fde038d0c9c6d2a2cd88b84e
+version = 10.4.12
+md5sum = 97d7c0f508c04a31c138fdb24e95dbc4
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 pre-configure =
   set -e '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
@@ -76,9 +76,10 @@ environment =
   CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
   LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
-post-install =
-  mkdir -p ${:location}/include/wsrep &&
-  cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
+post-install = set -e
+  set -- wsrep-lib/wsrep-API/*/wsrep_api.h
+  install -DpT $1 ${:location}/$1
+  cp -a wsrep-lib/include ${:location}/wsrep-lib
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
@@ -89,15 +90,10 @@ md5sum = d0af673f1bad3b9ccf33870bb2344a25
 pre-configure = set -e
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source
-  test -d ${mariadb:location}/include/mysql/server/private && (
-    mkdir -p fake_mariadb_source/sql
-    cp -a ${mariadb:location}/include/mysql/server/private/* fake_mariadb_source/sql
-    cp -a ${mariadb:location}/include/mysql/server/*.h fake_mariadb_source/sql
-    cp -a ${mariadb:location}/include/mysql/server/mysql fake_mariadb_source/sql
-  ) || ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
-  cp -ar ${mariadb:location}/include fake_mariadb_source/include
-  ! test -f fake_mariadb_source/include/mysql/mariadb_stmt.h ||
-  sed -i -E -e '/^enum enum_(cursor|indicator)_type$/,/};/d' fake_mariadb_source/include/mysql/mariadb_stmt.h
+  cd fake_mariadb_source
+  ln -s ${mariadb:location}/wsrep-lib
+  cp -a ${mariadb:location}/include/mysql/server include
+  mv include/private sql
 configure-options =
   --with-mysql-source=fake_mariadb_source
   --with-mysql-config=${mariadb:location}/bin/mysql_config
@@ -106,8 +102,6 @@ configure-options =
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0
-pre-build =
-  sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
 environment =
   PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga