Attachment #168296 for bug #208060

View | Details | Raw Unified | Return to bug 208060
Collapse All | Expand All

Lines 8-13 Link Here

(-)databases/percona56-client/Makefile (+2 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../percona56-server	9	MASTERDIR= ${.CURDIR}/../percona56-server
10		10
		11	OPTIONS_EXCLUDE=TOKUDB
		12
11	PKGMESSAGE= ${.CURDIR}/pkg-message	13	PKGMESSAGE= ${.CURDIR}/pkg-message
12	PATCHDIR= ${.CURDIR}/files	14	PATCHDIR= ${.CURDIR}/files
13	PLIST= ${.CURDIR}/pkg-plist	15	PLIST= ${.CURDIR}/pkg-plist




--- extra/CMakeLists.txt.orig	2016-03-03 15:27:37.000000000 +0200
+++ extra/CMakeLists.txt	2016-03-10 21:04:51.367091216 +0200
@@ -59,7 +59,7 @@
   ADD_DEPENDENCIES(GenError copy_openssl_extra)
 ENDIF()
 
-
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
 TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
 SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
@@ -98,10 +98,13 @@
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
 ENDIF()
+ENDIF()
 
 IF(UNIX)
+IF(FALSE)
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
+ENDIF()
 
   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)




# $FreeBSD$

PORTNAME?=	percona
DISTVERSION=	5.6.29-76.2
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/

SLAVEDIRS=	databases/percona56-client
USES=		bison cmake perl5 shebangfix

OPTIONS_DEFINE=	OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
OPTIONS_DEFAULT=	OPENSSL INNODBMEMCACHED
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
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_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb

DATADIR=	${PREFIX}/share/mysql


.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MOPENSSL}
CMAKE_ARGS+=	-DWITH_SSL=bundled
.endif
.if ${PORT_OPTIONS:MFASTMTX}
CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
.endif

# MySQL-Server part
.if !defined(CLIENT_ONLY)

Lines 1-2 Link Here

(-)databases/percona56-server/distinfo (-2 / +2 lines)
1	SHA256 (percona-server-5.6.27-75.0.tar.gz) = 7dc4a4efadaee25e11fd78838f4ad2c0d7921ac9cc3b95068626f918c0add8d7	1	SHA256 (percona-server-5.6.29-76.2.tar.gz) = 23217feafc92222f313aeeb6e1806d110c35e50cf0b5f74510a9f8babe22e4b9
2	SIZE (percona-server-5.6.27-75.0.tar.gz) = 54907367	2	SIZE (percona-server-5.6.29-76.2.tar.gz) = 55032788




--- storage/tokudb/CMakeLists.txt.orig	2016-03-03 15:32:33.000000000 +0200
+++ storage/tokudb/CMakeLists.txt	2016-03-08 10:13:58.000000000 +0200
@@ -1,6 +1,6 @@
 SET(TOKUDB_VERSION 5.6.29-76.2)
 # PerconaFT only supports x86-64 and cmake-2.8.9+
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND
     NOT CMAKE_VERSION VERSION_LESS "2.8.9")
 CHECK_CXX_SOURCE_COMPILES(
 "
@@ -118,5 +118,5 @@
     tokudb_thread.cc)
 MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
     LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++)
-SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
-SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ")
+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ")
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig	2016-03-03 15:31:53.000000000 +0200
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt	2016-03-10 11:13:23.772664272 +0200
@@ -69,7 +69,7 @@
   endif ()
 endfunction(add_space_separated_property)
 
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG")
 if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 endif ()
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig	2016-03-03 15:31:53.000000000 +0200
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc	2016-03-08 10:40:07.000000000 +0200
@@ -85,7 +85,7 @@
     if (oflag & O_CREAT) {
         va_list ap;
         va_start(ap, oflag);
-        mode_t mode = va_arg(ap, mode_t);
+        mode_t mode = va_arg(ap, int);
         va_end(ap);
         the_manager.lock_file_op();
         fd = call_real_open(file, oflag, mode);
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig	2016-03-03 15:31:53.000000000 +0200
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc	2016-03-08 10:37:19.000000000 +0200
@@ -36,7 +36,7 @@
 
 #include <string.h>
 #include <pthread.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "source_file.h"
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig	2016-03-03 15:31:53.000000000 +0200
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc	2016-03-08 10:38:58.000000000 +0200
@@ -104,7 +104,7 @@
     if (oflag & O_CREAT) {
         va_list op;
         va_start(op, oflag);
-        mode_t mode = va_arg(op, mode_t);
+        mode_t mode = va_arg(op, int);
         va_end(op);
         return real_open(file, oflag, mode);
     } else {

Lines 23-34 Link Here

(-)databases/percona56-server/pkg-plist (+6 lines)
23	bin/replace	23	bin/replace
24	bin/resolve_stack_dump	24	bin/resolve_stack_dump
25	bin/resolveip	25	bin/resolveip
		26	%%TOKUDB%%bin/tokuft_logprint
		27	%%TOKUDB%%bin/tokuftdump
		28	%%TOKUDB%%lib/mysql/libHotBackup.so
26	lib/mysql/libmysqld.a	29	lib/mysql/libmysqld.a
27	lib/mysql/plugin/adt_null.so	30	lib/mysql/plugin/adt_null.so
28	lib/mysql/plugin/audit_log.so	31	lib/mysql/plugin/audit_log.so
29	lib/mysql/plugin/auth.so	32	lib/mysql/plugin/auth.so
30	lib/mysql/plugin/auth_test_plugin.so	33	lib/mysql/plugin/auth_test_plugin.so
31	lib/mysql/plugin/daemon_example.ini	34	lib/mysql/plugin/daemon_example.ini
		35	%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
32	lib/mysql/plugin/handlersocket.so	36	lib/mysql/plugin/handlersocket.so
33	%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so	37	%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so
34	lib/mysql/plugin/libdaemon_example.so	38	lib/mysql/plugin/libdaemon_example.so
Lines 45-50 Link Here
45	lib/mysql/plugin/scalability_metrics.so	49	lib/mysql/plugin/scalability_metrics.so
46	lib/mysql/plugin/semisync_master.so	50	lib/mysql/plugin/semisync_master.so
47	lib/mysql/plugin/semisync_slave.so	51	lib/mysql/plugin/semisync_slave.so
		52	%%TOKUDB%%lib/mysql/plugin/tokudb_backup.so
48	lib/mysql/plugin/validate_password.so	53	lib/mysql/plugin/validate_password.so
49	libexec/mysqld	54	libexec/mysqld
50	man/man1/my_print_defaults.1.gz	55	man/man1/my_print_defaults.1.gz
Lines 74-79 Link Here
74	man/man1/resolve_stack_dump.1.gz	79	man/man1/resolve_stack_dump.1.gz
75	man/man1/resolveip.1.gz	80	man/man1/resolveip.1.gz
76	man/man8/mysqld.8.gz	81	man/man8/mysqld.8.gz
		82	%%TOKUDB%%share/doc/mysql/README_tokudb_backup
77	%%DATADIR%%/binary-configure	83	%%DATADIR%%/binary-configure
78	%%DATADIR%%/bulgarian/errmsg.sys	84	%%DATADIR%%/bulgarian/errmsg.sys
79	%%DATADIR%%/charsets/Index.xml	85	%%DATADIR%%/charsets/Index.xml

Return to bug 208060

Lines 1-24 Link Here

(-)databases/percona56-client/files/patch-extra_CMakeLists.txt (-7 / +7 lines)
1	--- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100	1	--- extra/CMakeLists.txt.orig 2016-03-03 15:27:37.000000000 +0200
2	+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100	2	+++ extra/CMakeLists.txt 2016-03-10 21:04:51.367091216 +0200
3	@@ -60,6 +60,7 @@	3	@@ -59,7 +59,7 @@
		4	ADD_DEPENDENCIES(GenError copy_openssl_extra)
4	ENDIF()	5	ENDIF()
5		6
6		7	-
7	+IF(FALSE)	8	+IF(FALSE)
8	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)	9	MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
9	TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)	10	TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
10	SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)	11	SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
11	@@ -96,11 +97,14 @@	12	@@ -98,10 +98,13 @@
12	MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})	13	MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
13	TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)	14	TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
14	ENDIF()	15	ENDIF()
15	+ENDIF()	16	+ENDIF()
16		17
17	IF(UNIX)	18	IF(UNIX)
18	+IF(FALSE)	19	+IF(FALSE)
19	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)	20	MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
20	TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)	21	TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
21	SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
22	+ENDIF()	22	+ENDIF()
23		23
24	MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)	24	MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)

Lines 2-8 Link Here

(-)databases/percona56-server/Makefile (-10 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= percona	4	PORTNAME?= percona
5	DISTVERSION= 5.6.27-75.0	5	DISTVERSION= 5.6.29-76.2
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/	8	MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
Lines 15-26 Link Here
15	SLAVEDIRS= databases/percona56-client	15	SLAVEDIRS= databases/percona56-client
16	USES= bison cmake perl5 shebangfix	16	USES= bison cmake perl5 shebangfix
17		17
18	OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED	18	OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
19	OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED	19	OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED
20	OPTIONS_SUB= yes	20	OPTIONS_SUB= yes
		21
21	FASTMTX_DESC= Replace mutexes with spinlocks	22	FASTMTX_DESC= Replace mutexes with spinlocks
		23	FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
22	INNODBMEMCACHED_DESC= InnoDB Memcached plugin	24	INNODBMEMCACHED_DESC= InnoDB Memcached plugin
23	INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1	25	INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1
		26	OPENSSL_CMAKE_ON= -DWITH_SSL=bundled
		27	TOKUDB_DESC= TokuDB Engine (experimental)
		28	TOKUDB_CMAKE_ON=-DUSE_CTAGS=0
		29	TOKUDB_VARS= ONLY_FOR_ARCHS="amd64" \
		30	ONLY_FOR_ARCHS_REASON="TokuDB engine does not compile on ${ARCH}"
		31	TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
24		32
25	DATADIR= ${PREFIX}/share/mysql	33	DATADIR= ${PREFIX}/share/mysql
26		34
Lines 49-62 Link Here
49	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	57	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
50	.endif	58	.endif
51		59
52	.include <bsd.port.options.mk>
53
54	.if ${PORT_OPTIONS:MOPENSSL}
55	CMAKE_ARGS+= -DWITH_SSL=bundled
56	.endif
57	.if ${PORT_OPTIONS:MFASTMTX}
58	CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
59	.endif
60		60
61	# MySQL-Server part	61	# MySQL-Server part
62	.if !defined(CLIENT_ONLY)	62	.if !defined(CLIENT_ONLY)

Added Link Here

(-)databases/percona56-server/files/extrapatch-tokudb (+62 lines)
1	--- storage/tokudb/CMakeLists.txt.orig 2016-03-03 15:32:33.000000000 +0200
2	+++ storage/tokudb/CMakeLists.txt 2016-03-08 10:13:58.000000000 +0200
3	@@ -1,6 +1,6 @@
4	SET(TOKUDB_VERSION 5.6.29-76.2)
5	# PerconaFT only supports x86-64 and cmake-2.8.9+
6	-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
7	+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND
8	NOT CMAKE_VERSION VERSION_LESS "2.8.9")
9	CHECK_CXX_SOURCE_COMPILES(
10	"
11	@@ -118,5 +118,5 @@
12	tokudb_thread.cc)
13	MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
14	LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++)
15	-SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
16	-SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
17	+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ")
18	+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ")
19	--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig 2016-03-03 15:31:53.000000000 +0200
20	+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt 2016-03-10 11:13:23.772664272 +0200
21	@@ -69,7 +69,7 @@
22	endif ()
23	endfunction(add_space_separated_property)
24
25	-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG")
26	+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG")
27	if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
28	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
29	endif ()
30	--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig 2016-03-03 15:31:53.000000000 +0200
31	+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc 2016-03-08 10:40:07.000000000 +0200
32	@@ -85,7 +85,7 @@
33	if (oflag & O_CREAT) {
34	va_list ap;
35	va_start(ap, oflag);
36	- mode_t mode = va_arg(ap, mode_t);
37	+ mode_t mode = va_arg(ap, int);
38	va_end(ap);
39	the_manager.lock_file_op();
40	fd = call_real_open(file, oflag, mode);
41	--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig 2016-03-03 15:31:53.000000000 +0200
42	+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc 2016-03-08 10:37:19.000000000 +0200
43	@@ -36,7 +36,7 @@
44
45	#include <string.h>
46	#include <pthread.h>
47	-#include <malloc.h>
48	+#include <stdlib.h>
49	#include <stdio.h>
50
51	#include "source_file.h"
52	--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig 2016-03-03 15:31:53.000000000 +0200
53	+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc 2016-03-08 10:38:58.000000000 +0200
54	@@ -104,7 +104,7 @@
55	if (oflag & O_CREAT) {
56	va_list op;
57	va_start(op, oflag);
58	- mode_t mode = va_arg(op, mode_t);
59	+ mode_t mode = va_arg(op, int);
60	va_end(op);
61	return real_open(file, oflag, mode);
62	} else {