diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg new file mode 100644 index 00000000000..32f7ba8b8b5 --- /dev/null +++ b/srcpkgs/mariadb/INSTALL.msg @@ -0,0 +1,3 @@ +If you come from a System that used the MySQL package, +than restart your mysql service and upgrade your database +wtih mysql_upgrade(1) diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 60c37cf5ef2..b55a0cd36a3 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb -version=10.1.47 -revision=3 +version=10.1.48 +revision=1 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -27,7 +27,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="https://mariadb.org/" distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz" -checksum=a4267487dbddf1dc1faed6e2a322c50a3e80d5d271cb487e8bdad6840e003227 +checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9 lib32disabled=yes provides="mysql-${version}_${revision}" replaces="mysql>=0" @@ -66,12 +66,8 @@ pre_build() { export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql fi export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability - case "$XBPS_TARGET_MACHINE" in - aarch64*) # Work around GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81228 - sed -i build/storage/mroonga/vendor/groonga/lib/CMakeFiles/libgroonga.dir/flags.make \ - -e "s; -O3;;g" - ;; - esac + # It seems that there is no dependency listed in cmake on them, but they are still needed + ninja -C build sql/sql_yacc.cc sql/lex_hash.h } post_install() {