snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Merge pull request #3654 from stpx/mariadb 

mariadb: update to 10.1.12.
This commit is contained in:
Juan RP 2016-03-12 08:39:19 +01:00
parent 33b7634657 924bf91f9a
commit e0626bfa54
6 changed files with 18 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcpkgs/mariadb/patches/fix-cross.patch
View File

@ -15,18 +15,3 @@
#
# Setup maintainer mode options. Platform checks are
--- ./storage/innobase/CMakeLists.txt.orig 2015-09-18 21:28:54.446428704 -0400
+++ ./storage/innobase/CMakeLists.txt 2015-09-18 21:40:24.987436643 -0400
@@ -15,6 +15,10 @@
# This is the CMakeLists for InnoDB
+IF(NOT WITH_INNOBASE_STORAGE_ENGINE)
+ RETURN()
+ENDIF()
+
INCLUDE(CheckFunctionExists)
INCLUDE(CheckCSourceCompiles)
INCLUDE(CheckCSourceRuns)

36
srcpkgs/mariadb/patches/fix-musl.patch
View File

@ -1,36 +0,0 @@
--- ./strings/my_vsnprintf.c.orig 2015-09-16 23:54:27.348529851 -0400
+++ ./strings/my_vsnprintf.c 2015-09-16 23:57:11.968524828 -0400
@@ -827,11 +827,7 @@
*/
#if defined(__WIN__)
strerror_s(buf, len, nr);
-#elif ((defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE >= 200112L)) || \
- (defined _XOPEN_SOURCE && (_XOPEN_SOURCE >= 600))) && \
- ! defined _GNU_SOURCE
- strerror_r(nr, buf, len); /* I can build with or without GNU */
-#elif defined _GNU_SOURCE
+#elif defined(__GLIBC__) && defined (_GNU_SOURCE)
char *r= strerror_r(nr, buf, len);
if (r != buf) /* Want to help, GNU? */
strmake(buf, r, len - 1); /* Then don't. */
--- ./storage/mroonga/vendor/groonga/lib/com.c.orig 2015-09-16 23:53:30.468531587 -0400
+++ ./storage/mroonga/vendor/groonga/lib/com.c 2015-09-16 23:53:43.165531199 -0400
@@ -351,7 +351,7 @@
struct epoll_event e;
memset(&e, 0, sizeof(struct epoll_event));
e.data.fd = (fd);
- e.events = (__uint32_t) events;
+ e.events = (uint32_t) events;
if (epoll_ctl(ev->epfd, EPOLL_CTL_ADD, (fd), &e) == -1) {
SERR("epoll_ctl");
return ctx->rc;
@@ -399,7 +399,7 @@
struct epoll_event e;
memset(&e, 0, sizeof(struct epoll_event));
e.data.fd = (fd);
- e.events = (__uint32_t) events;
+ e.events = (uint32_t) events;
if (epoll_ctl(ev->epfd, EPOLL_CTL_MOD, (fd), &e) == -1) {
SERR("epoll_ctl");
return ctx->rc;

11
srcpkgs/mariadb/patches/musl-execinfo.patch
View File

@ -1,11 +0,0 @@
--- ./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 ()

11
srcpkgs/mariadb/patches/musl_ucontext-h.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./include/my_context.h.orig 2016-02-24 09:25:21.000000000 -0500
+++ ./include/my_context.h 2016-02-28 15:14:29.098180308 -0500
@@ -31,7 +31,7 @@
#define MY_CONTEXT_USE_X86_64_GCC_ASM
#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
#define MY_CONTEXT_USE_I386_GCC_ASM
-#elif defined(HAVE_UCONTEXT_H)
+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
#define MY_CONTEXT_USE_UCONTEXT
#else
#define MY_CONTEXT_DISABLE

35
srcpkgs/mariadb/patches/poll-h.patch
View File

@ -1,35 +0,0 @@
--- ./libmysql/libmysql.c.orig 2015-09-19 22:16:15.039454684 -0400
+++ ./libmysql/libmysql.c 2015-09-19 22:16:44.841455027 -0400
@@ -48,7 +48,7 @@
#endif
#endif /* !defined(__WIN__) */
#ifdef HAVE_POLL
-#include <sys/poll.h>
+#include <poll.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
--- ./include/my_net.h.orig 2015-09-19 22:18:14.641456059 -0400
+++ ./include/my_net.h 2015-09-19 22:18:29.871456234 -0400
@@ -37,7 +37,7 @@
#include <arpa/inet.h>
#endif
#ifdef HAVE_POLL
-#include <sys/poll.h>
+#include <poll.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
--- ./storage/mroonga/vendor/groonga/lib/grn_com.h.orig 2015-09-19 22:53:30.420480384 -0400
+++ ./storage/mroonga/vendor/groonga/lib/grn_com.h 2015-09-19 22:54:29.412481062 -0400
@@ -83,7 +83,7 @@
# define GRN_COM_POLLIN EVFILT_READ
# define GRN_COM_POLLOUT EVFILT_WRITE
# else /* USE_KQUEUE */
-# include <sys/poll.h>
+# include <poll.h>
# define GRN_COM_POLLIN POLLIN
# define GRN_COM_POLLOUT POLLOUT
# endif /* USE_KQUEUE */

17
srcpkgs/mariadb/template
View File

@ -1,6 +1,6 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.0.24
version=10.1.12
revision=1
build_style=cmake
configure_args="-DMYSQL_DATADIR=/var/lib/mysql
@ -12,10 +12,11 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
-DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
-DWITH_ZLIB=system -DWITH_PCRE=system -DWITH_READLINE=ON -DWITH_SSL=system
-DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DWITHOUT_TOKUDB=1
-DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
-DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1"
-DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
-DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
lib32disabled=yes
hostmakedepends="perl cmake bison ncurses-devel"
makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel"
@ -30,18 +31,14 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://mariadb.org/"
license="GPL-2"
distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz"
checksum=65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094
checksum=795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7
CFLAGS="-w"
case "$XBPS_TARGET_MACHINE" in
armv*-musl)
broken=http://build.voidlinux.eu/builders/armv6l-musl_builder/builds/8590/steps/shell_3/logs/stdio ;;
armv*)
configure_args+=" -DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE_EXITCODE=0" ;;
esac
if [ -z "$CROSS_BUILD" ]; then
configure_args+=" -DINNODB=1"
fi
pre_configure() {
# We need some host binaries before starting cross compilation.
if [ "$CROSS_BUILD" ]; then