diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch index 2f0c33fdc35..c0c10dcf662 100644 --- a/srcpkgs/mariadb/patches/fix-cross.patch +++ b/srcpkgs/mariadb/patches/fix-cross.patch @@ -30,14 +30,3 @@ INCLUDE(CheckCSourceCompiles) INCLUDE(CheckCSourceRuns) ---- ./storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-09-19 21:44:36.724432860 -0400 -+++ ./storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake 2015-09-19 21:45:58.880433804 -0400 -@@ -92,7 +92,7 @@ - if (HAVE_BACKTRACE_WITH_EXECINFO) - list(APPEND EXTRA_SYSTEM_LIBS execinfo) - else () -- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") -+ message(WARNING "Cannot find backtrace(), even with -lexecinfo.") - endif () - endif () - diff --git a/srcpkgs/mariadb/patches/musl-execinfo.patch b/srcpkgs/mariadb/patches/musl-execinfo.patch new file mode 100644 index 00000000000..41c284e7724 --- /dev/null +++ b/srcpkgs/mariadb/patches/musl-execinfo.patch @@ -0,0 +1,11 @@ +--- ./storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-12-20 16:08:01.849875314 -0500 ++++ ./storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2015-12-20 16:08:16.357758151 -0500 +@@ -93,7 +93,7 @@ + if (HAVE_BACKTRACE_WITH_EXECINFO) + list(APPEND EXTRA_SYSTEM_LIBS execinfo) + else () +- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") ++ message(WARNING "Cannot find backtrace(), even with -lexecinfo.") + endif () + endif () + diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 16f6940953e..707db3727bc 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,6 +1,6 @@ # Template file for 'mariadb' pkgname=mariadb -version=10.0.22 +version=10.0.23 revision=1 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql @@ -30,12 +30,10 @@ maintainer="Juan RP " homepage="http://mariadb.org/" license="GPL-2" distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz" -checksum=9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b +checksum=156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 CFLAGS="-w" if [ -z "$CROSS_BUILD" ]; then - # configure_args+=" -DWITH_XTRADB=1 -DWITH_INNOBASE_STORAGE_ENGINE=1" - # configure_args+=" -DWITH_XTRADB=1 -DINNODB=1" configure_args+=" -DINNODB=1" fi