summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2019-01-06 17:02:51 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2019-01-09 22:47:41 +0100
commitd82d5592ea547610c0a6f856a1fdf8b52cde7cdb (patch)
tree17ebbbec79a51e7f0e46e36663f3cafca415c3cc
parent13bc3e2161aeba82e9d461c379fb2cc8adc0da5a (diff)
downloadnet-d82d5592ea547610c0a6f856a1fdf8b52cde7cdb.tar.gz
net-d82d5592ea547610c0a6f856a1fdf8b52cde7cdb.tar.xz
mariadb: Version bump to 10.3.12
-rw-r--r--metadata/repository_mask.conf7
-rw-r--r--packages/dev-db/mariadb/mariadb-10.3.12.exheres-013
-rw-r--r--packages/dev-db/mariadb/mariadb.exlib27
3 files changed, 45 insertions, 2 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index f2aa7b6..562dab7 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -277,3 +277,10 @@ net-mail/cyrus-imapd [[
token = pending-removal
description = [ Fails to build due to banned ar, obviously unmaintained on Exherbo ]
]]
+
+dev-db/mariadb[>10.3] [[
+ author = [ Heiko Becker <heirecka@exherbo.org> ]
+ date = [ 06 Jan 2019 ]
+ token = testing
+ description = [ Give it a bit of time to make sure nothing major breaks ]
+]]
diff --git a/packages/dev-db/mariadb/mariadb-10.3.12.exheres-0 b/packages/dev-db/mariadb/mariadb-10.3.12.exheres-0
new file mode 100644
index 0000000..6ce712d
--- /dev/null
+++ b/packages/dev-db/mariadb/mariadb-10.3.12.exheres-0
@@ -0,0 +1,13 @@
+# Copyright 2013 Pierre Lejeune <superheron@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+require mariadb
+
+PLATFORMS="~amd64 ~armv7 ~armv8"
+
+DEFAULT_SRC_PREPARE_PATCHES+=(
+ "${FILES}"/${PN}-Add-FindSnappy.cmake.patch
+ "${FILES}"/${PN}-Allow-build-a-system-snappy.patch
+ "${FILES}"/${PN}-Use-INSTALL_-BIN-LIB-DIR-to-install-mariadb_config-a.patch
+)
+
diff --git a/packages/dev-db/mariadb/mariadb.exlib b/packages/dev-db/mariadb/mariadb.exlib
index 4ce588e..a553b0f 100644
--- a/packages/dev-db/mariadb/mariadb.exlib
+++ b/packages/dev-db/mariadb/mariadb.exlib
@@ -15,7 +15,7 @@ SUMMARY="An enhanced, drop-in replacement for MySQL"
HOMEPAGE="https://${PN}.org"
DOWNLOADS="mirror://${PN}/${PNV}/source/${PNV}.tar.gz"
-REMOTE_IDS="freecode:${PN}"
+REMOTE_IDS="freshcode:${PN}"
UPSTREAM_CHANGELOG="https://${PN}.com/kb/en/${PN}-$(ever delete_all)-changelog [[ lang = [ en ] ]]"
UPSTREAM_DOCUMENTATION="https://${PN}.com/kb/en [[ lang = [ en ] ]]"
UPSTREAM_RELEASE_NOTES="https://${PN}.com/kb/en/${PN}-$(ever delete_all)-release-notes [[ lang = [ en ] ]]"
@@ -109,6 +109,12 @@ mariadb_src_prepare() {
edo sed -e "/^MY_ADD_TEST(mf_iocache)/d" \
-i unittest/sql/CMakeLists.txt
+ if ever at_least 10.3.11 ; then
+ # Disable test which doesn't work out of the box
+ edo sed -e "/^MY_ADD_TEST(test-connect)/d" \
+ -i unittest/embedded/CMakeLists.txt
+ fi
+
edo sed \
-e 's:DESTINATION "bin":DESTINATION ${INSTALL_BINDIR}:g' \
-i libmariadb/mariadb_config/CMakeLists.txt
@@ -229,6 +235,15 @@ mariadb_src_configure() {
)
fi
+ if ever at_least 10.3.11 ; then
+ cmakeargs+=(
+ -DWITH_ASAN:BOOL=OFF
+ -DWITH_TSAN:BOOL=OFF
+ # unwritten
+ -DWITH_NUMA:STRING="OFF"
+ )
+ fi
+
CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks -Wno-error"
CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks -Wno-error"
@@ -244,7 +259,15 @@ mariadb_src_install() {
keepdir /etc/mysql
- edo cp "${IMAGE}"/usr/share/doc/${PNVR}/support-files/my-small.cnf "${IMAGE}"/etc/mysql/my.cnf
+ if ever at_least 10.3.11 ; then
+ # MYSQL_ADD_EXECUTABLE also installs the executable, which isn't
+ # really wanted in case of a unit test.
+ edo rm "${IMAGE}"/usr/$(exhost --target)/bin/test-connect-t
+ else
+ # Removed upstream in 10.3.x: "The dates on the these files shows they
+ # are very dated...the default values are quite decent..."
+ edo cp "${IMAGE}"/usr/share/doc/${PNVR}/support-files/my-small.cnf "${IMAGE}"/etc/mysql/my.cnf
+ fi
# edo mv "${IMAGE}"/usr/bin/mysqlaccess.conf "${IMAGE}"/etc/mysql/mysqlaccess.conf
# edo chmod 644 "${IMAGE}"/etc/mysql/mysqlaccess.conf