- Update to 5.6.31-77.0 [1]

- fix TOKUDB option

PR:		209785 [1]
Submitted by:	Thomas Babut
This commit is contained in:
Florian Smeets 2016-08-10 09:13:30 +00:00
parent b630b0056f
commit 263a9b3147
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419995
4 changed files with 59 additions and 14 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= percona
DISTVERSION= 5.6.29-76.2
DISTVERSION= 5.6.31-77.0
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
@ -19,17 +19,15 @@ USES= bison cmake perl5 shebangfix
OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED
OPTIONS_SUB= yes
OPTIONS_SUB= yes
FASTMTX_DESC= Replace mutexes with spinlocks
FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
INNODBMEMCACHED_DESC= InnoDB Memcached plugin
INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1
OPENSSL_CMAKE_ON= -DWITH_SSL=bundled
FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
INNODBMEMCACHED_DESC= InnoDB Memcached plugin
INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1
OPENSSL_CMAKE_ON= -DWITH_SSL=bundled
TOKUDB_DESC= TokuDB Engine (experimental)
TOKUDB_CMAKE_ON=-DUSE_CTAGS=0
TOKUDB_VARS= ONLY_FOR_ARCHS="amd64" \
ONLY_FOR_ARCHS_REASON="TokuDB engine does not compile on ${ARCH}"
TOKUDB_CMAKE_ON= -DUSE_CTAGS=0
TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
DATADIR= ${PREFIX}/share/mysql
@ -59,11 +57,9 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
# MySQL-Server part
.if !defined(CLIENT_ONLY)
USE_MYSQL= yes
WANT_MYSQL_VER= 56p
USES+=mysql:56p
CONFLICTS_INSTALL= mysql*-server-* \
mariadb*-server-* \
@ -101,4 +97,16 @@ post-patch:
BROKEN= Does not compile on arm
.endif
.if ${PORT_OPTIONS:MTOKUDB}
NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \
https://github.com/percona/PerconaFT/blob/master/README.md
.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000
IGNORE= unsupported on FreeBSD 9 or older
.endif
.endif
.include <bsd.port.post.mk>

View File

@ -1,2 +1,3 @@
SHA256 (percona-server-5.6.29-76.2.tar.gz) = 23217feafc92222f313aeeb6e1806d110c35e50cf0b5f74510a9f8babe22e4b9
SIZE (percona-server-5.6.29-76.2.tar.gz) = 55032788
TIMESTAMP = 1469549653
SHA256 (percona-server-5.6.31-77.0.tar.gz) = 955fefc5a0a69b2cd44db64378678a773fb98e1260f68a067836473862c89fe7
SIZE (percona-server-5.6.31-77.0.tar.gz) = 55086290

View File

@ -60,3 +60,33 @@
va_end(op);
return real_open(file, oflag, mode);
} else {
--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-06-30 13:35:08.000000000 +0200
+++ storage/tokudb/PerconaFT/CMakeLists.txt 2016-07-29 23:07:37.871068000 +0200
@@ -82,7 +82,7 @@
install(
FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
- DESTINATION .
+ DESTINATION ${INSTALL_DOCDIR}
COMPONENT tokukv_misc
)
--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-07-29 23:30:26.557847000 +0200
+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-07-29 23:30:32.695950000 +0200
@@ -1,6 +1,6 @@
set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh
out=$1; shift
exec \"$@\" >$out")
@@ -8,7 +8,7 @@
set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h"
- COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
+ COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
DEPENDS make_tdb)
add_custom_target(install_tdb_h DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/db.h")

View File

@ -25,6 +25,7 @@ bin/resolve_stack_dump
bin/resolveip
%%TOKUDB%%bin/tokuft_logprint
%%TOKUDB%%bin/tokuftdump
%%TOKUDB%%include/backup.h
%%TOKUDB%%lib/mysql/libHotBackup.so
lib/mysql/libmysqld.a
lib/mysql/plugin/adt_null.so
@ -49,6 +50,7 @@ lib/mysql/plugin/query_response_time.so
lib/mysql/plugin/scalability_metrics.so
lib/mysql/plugin/semisync_master.so
lib/mysql/plugin/semisync_slave.so
lib/mysql/plugin/test_udf_services.so
%%TOKUDB%%lib/mysql/plugin/tokudb_backup.so
lib/mysql/plugin/validate_password.so
libexec/mysqld
@ -79,6 +81,10 @@ man/man1/replace.1.gz
man/man1/resolve_stack_dump.1.gz
man/man1/resolveip.1.gz
man/man8/mysqld.8.gz
%%TOKUDB%%share/doc/mysql/COPYING.AGPLv3
%%TOKUDB%%share/doc/mysql/COPYING.GPLv2
%%TOKUDB%%share/doc/mysql/PATENTS
%%TOKUDB%%share/doc/mysql/README.md
%%TOKUDB%%share/doc/mysql/README_tokudb_backup
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys