Attachment #209328 for bug #241335

Lines 6-13 Link Here

(-)mariadb104-client/Makefile (-2 lines)
6		6
7	COMMENT= Multithreaded SQL database (client)	7	COMMENT= Multithreaded SQL database (client)
8		8
9	BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32'
10
11	MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}	9	MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
12		10
13	FILESDIR= ${.CURDIR}/files	11	FILESDIR= ${.CURDIR}/files




WITHOUT_SERVER installs server-only files

https://jira.mariadb.org/browse/MDEV-11790
--- extra/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
+++ extra/CMakeLists.txt
@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(innochecksum GenError)

 TARGET_LINK_LIBRARIES(replace mysys)
 
 IF(UNIX)
--- scripts/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
+++ scripts/CMakeLists.txt
@@ -241,7 +241,10 @@ ENDIF()
 SET(mysql_config_COMPONENT COMPONENT Development)

 SET(mytop_COMPONENT Mytop)
 
 IF(WIN32)
@@ -296,14 +299,14 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(BIN_SCRIPTS
     msql2mysql

Lines 1-7 Link Here

(-)mariadb104-client/files/patch-MDEV-15961 (-2 / +2 lines)
1	MDEV-15961: Fix stacktraces under FreeBSD	1	MDEV-15961: Fix stacktraces under FreeBSD
2		2
3	https://jira.mariadb.org/browse/MDEV-15961	3	https://jira.mariadb.org/browse/MDEV-15961
4	--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC	4	--- mysys/stacktrace.c.orig 2019-11-07 05:52:22 UTC
5	+++ mysys/stacktrace.c	5	+++ mysys/stacktrace.c
6	@@ -34,19 +34,19 @@	6	@@ -34,19 +34,19 @@
7	#include <execinfo.h>	7	#include <execinfo.h>
Lines 29-35 Link Here
29	}	29	}
30		30
31	#ifdef __linux__	31	#ifdef __linux__
32	@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad	32	@@ -149,15 +149,16 @@ static int safe_print_str(const char *addr, size_t max
33		33
34	int my_safe_print_str(const char* val, size_t max_len)	34	int my_safe_print_str(const char* val, size_t max_len)
35	{	35	{

Lines 2-8 Link Here

(-)mariadb104-server/Makefile (-7 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mariadb	4	PORTNAME?= mariadb
5	PORTVERSION= 10.4.7	5	PORTVERSION= 10.4.10
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
Lines 24-34 Link Here
24	LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS	24	LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
25	LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	25	LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
26		26
		27	USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
		28
27	SUB_FILES= pkg-message	29	SUB_FILES= pkg-message
28	PKGMESSAGE= ${WRKDIR}/pkg-message	30	PKGMESSAGE= ${WRKDIR}/pkg-message
29		31
30	SLAVEDIRS= databases/mariadb102-client	32	SLAVEDIRS= databases/mariadb102-client
31	USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
32	USE_LDCONFIG= ${PREFIX}/lib/mysql	33	USE_LDCONFIG= ${PREFIX}/lib/mysql
33	SHEBANG_FILES= scripts/*.sh	34	SHEBANG_FILES= scripts/*.sh
34	SITESDIR= mariadb/mariadb-${PORTVERSION}/source	35	SITESDIR= mariadb/mariadb-${PORTVERSION}/source
Lines 42-53 Link Here
42	# MySQL-Server options	43	# MySQL-Server options
43	OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP	44	OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
44	OPTIONS_GROUP= COMPRESSION ENGINES GROONGA	45	OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
45	OPTIONS_DEFINE= AWS_KMS CONNECT_EXTRA DOCS	46	OPTIONS_DEFINE= CONNECT_EXTRA DOCS
46	OPTIONS_DEFINE_amd64= WSREP	47	OPTIONS_DEFINE_amd64= WSREP
47	OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD	48	OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD
48	OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB	49	OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
49	OPTIONS_GROUP_GROONGA= ZMQ MSGPACK	50	OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
50	OPTIONS_EXCLUDE_i386= TOKUDB	51	OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB
51		52
52	CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine	53	CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
53	COMPRESSION_DESC= Optional page compression	54	COMPRESSION_DESC= Optional page compression
Lines 142-147 Link Here
142	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4	143	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
143	LZO_CMAKE_BOOL= WITH_INNODB_LZO	144	LZO_CMAKE_BOOL= WITH_INNODB_LZO
144	LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2	145	LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
		146	MROONGA_BROKEN= error: expected unqualified-id
145	MROONGA_IMPLIES= LZ4	147	MROONGA_IMPLIES= LZ4
146	MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack	148	MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
147	OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \	149	OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
Lines 149-159 Link Here
149	ROCKSDB_USES= python	151	ROCKSDB_USES= python
150	SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy	152	SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy
151	SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy	153	SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
152	TOKUDB_BROKEN= Error with bundled liblzma
153	TOKUDB_IMPLIES= SNAPPY	154	TOKUDB_IMPLIES= SNAPPY
154	TOKUDB_PORTDOCS= README.md	155	TOKUDB_PORTDOCS= README.md
155	TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi	156	TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
156	WSREP_CMAKE_BOOL= WITH_WSREP	157	WSREP_CMAKE_BOOL= WITH_WSREP
		158	WSREP_LIB_DEPENDS= libgalera.so:databases/galera26
157	ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4	159	ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
158	ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD	160	ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD
159	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd	161	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
Lines 178-183 Link Here
178		180
179	.include <bsd.port.pre.mk>	181	.include <bsd.port.pre.mk>
180		182
		183	.if ${ARCH} == "i386"
		184	EXTRA_PATCHES= ${PATCHDIR}/extrapatch-MDEV-13728
		185	.endif
		186
181	.if ${ARCH} != amd64	187	.if ${ARCH} != amd64
182	PLIST_SUB+= WSREP="@comment "	188	PLIST_SUB+= WSREP="@comment "
183	.endif	189	.endif
Lines 201-208 Link Here
201	-e 's\|(#define LIBS .*)"$$\|\1 -L${PREFIX}/lib"\|' \	207	-e 's\|(#define LIBS .*)"$$\|\1 -L${PREFIX}/lib"\|' \
202	${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c	208	${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
203		209
204	# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072	210	# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
205	post-configure-INNOBASE-on:	211	post-configure-INNOBASE-on:
206	${REINPLACE_CMD} -e 's\| ${PREFIX}/lib/liblz4.so$.* ${PREFIX}/lib/liblz4.so.*$\|\1\|' \	212	${REINPLACE_CMD} -e 's\| ${PREFIX}/lib/liblz4.so$.* ${PREFIX}/lib/liblz4.so.*$\|\1\|' \
207	-e 's\| ${PREFIX}/lib/liblzo2.so$.* ${PREFIX}/lib/liblzo2.so.*$\|\1\|' \	213	-e 's\| ${PREFIX}/lib/liblzo2.so$.* ${PREFIX}/lib/liblzo2.so.*$\|\1\|' \
208	-e 's\| ${PREFIX}/lib/libsnappy.so$.* ${PREFIX}/lib/libsnappy.so$\|\1\|' \	214	-e 's\| ${PREFIX}/lib/libsnappy.so$.* ${PREFIX}/lib/libsnappy.so$\|\1\|' \

Lines 1-3 Link Here

(-)mariadb104-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1564591340	1	TIMESTAMP = 1574142229
2	SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817	2	SHA256 (mariadb-10.4.10.tar.gz) = cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421
3	SIZE (mariadb-10.4.7.tar.gz) = 78155161	3	SIZE (mariadb-10.4.10.tar.gz) = 78352896




WITHOUT_SERVER installs server-only files

https://jira.mariadb.org/browse/MDEV-11790
--- extra/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
+++ extra/CMakeLists.txt
@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_DEPENDENCIES(innochecksum GenError)

 TARGET_LINK_LIBRARIES(replace mysys)
 
 IF(UNIX)
--- scripts/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
+++ scripts/CMakeLists.txt
@@ -241,7 +241,10 @@ ENDIF()
 SET(mysql_config_COMPONENT COMPONENT Development)

 SET(mytop_COMPONENT Mytop)
 
 IF(WIN32)
@@ -296,14 +299,14 @@ ELSE()
   # On Unix, most of the files end up in the bin directory
   SET(BIN_SCRIPTS
     msql2mysql

Lines 1-7 Link Here

(-)mariadb104-server/files/patch-MDEV-15961 (-2 / +2 lines)
1	MDEV-15961: Fix stacktraces under FreeBSD	1	MDEV-15961: Fix stacktraces under FreeBSD
2		2
3	https://jira.mariadb.org/browse/MDEV-15961	3	https://jira.mariadb.org/browse/MDEV-15961
4	--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC	4	--- mysys/stacktrace.c.orig 2019-11-07 05:52:22 UTC
5	+++ mysys/stacktrace.c	5	+++ mysys/stacktrace.c
6	@@ -34,19 +34,19 @@	6	@@ -34,19 +34,19 @@
7	#include <execinfo.h>	7	#include <execinfo.h>
Lines 29-35 Link Here
29	}	29	}
30		30
31	#ifdef __linux__	31	#ifdef __linux__
32	@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad	32	@@ -149,15 +149,16 @@ static int safe_print_str(const char *addr, size_t max
33		33
34	int my_safe_print_str(const char* val, size_t max_len)	34	int my_safe_print_str(const char* val, size_t max_len)
35	{	35	{




--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig	2019-07-30 11:32:16.000000000 +0000
+++ plugin/auth_pam/testing/pam_mariadb_mtr.c	2019-08-20 18:31:37.712246000 +0000
@@ -15,6 +15,9 @@
 
 #define N 3
 
+typedef unsigned int uint;
+typedef unsigned short ushort;
+
 int pam_sm_authenticate(pam_handle_t *pamh, int flags,
                         int argc, const char *argv[])
 {
--- plugin/auth_pam/CMakeLists.txt.orig	2019-07-30 11:32:16.000000000 +0000
+++ plugin/auth_pam/CMakeLists.txt	2019-08-23 12:04:17.702326000 +0000
@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H)
                      WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
                    COMPONENT Server)
   ENDIF()
-  IF(TARGET auth_pam OR TARGET auth_pam_v1)
-    ADD_SUBDIRECTORY(testing)
-  ENDIF()
 ENDIF(HAVE_PAM_APPL_H)

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt (-3 / +3 lines)
1	--- libmariadb/include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC	1	--- libmariadb/include/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
2	+++ libmariadb/include/CMakeLists.txt	2	+++ libmariadb/include/CMakeLists.txt
3	@@ -21,6 +21,7 @@ IF(WIN32)	3	@@ -27,6 +27,7 @@ IF(WIN32)
4	SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)	4	SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
5	ENDIF()	5	ENDIF()
6		6
Lines 8-14 Link Here
8	INSTALL(FILES	8	INSTALL(FILES
9	${MARIADB_CLIENT_INCLUDES}	9	${MARIADB_CLIENT_INCLUDES}
10	DESTINATION ${INSTALL_INCLUDEDIR}	10	DESTINATION ${INSTALL_INCLUDEDIR}
11	@@ -33,3 +34,4 @@ INSTALL(FILES	11	@@ -39,3 +40,4 @@ INSTALL(FILES
12	${MARIADB_ADDITIONAL_INCLUDES}	12	${MARIADB_ADDITIONAL_INCLUDES}
13	DESTINATION ${INSTALL_INCLUDEDIR}/mariadb	13	DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
14	COMPONENT Development)	14	COMPONENT Development)

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt (-3 / +3 lines)
1	--- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC	1	--- libmariadb/libmariadb/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
2	+++ libmariadb/libmariadb/CMakeLists.txt	2	+++ libmariadb/libmariadb/CMakeLists.txt
3	@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT	3	@@ -447,9 +447,11 @@ ENDIF()
4	INSTALL(TARGETS mariadbclient	4	INSTALL(TARGETS mariadbclient
5	COMPONENT Development	5	COMPONENT Development
6	DESTINATION ${INSTALL_LIBDIR})	6	DESTINATION ${INSTALL_LIBDIR})
Lines 10-14 Link Here
10	DESTINATION ${INSTALL_LIBDIR})	10	DESTINATION ${INSTALL_LIBDIR})
11	+ENDIF()	11	+ENDIF()
12		12
		13
13	IF(WIN32)	14	IF(WIN32)
14	# On Windows, install PDB




--- libmariadb/plugins/auth/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
+++ libmariadb/plugins/auth/CMakeLists.txt
@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
 INCLUDE_DIRECTORIES(${AUTH_DIR})
 INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
 
+IF(NOT WITHOUT_CLIENT)
 SET(CRYPTO_PLUGIN 1)
 IF(WIN32)
   SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
 ELSE()
   UNSET(CRYPTO_PLUGIN)
 ENDIF()
+ENDIF()
 
 #native password
 REGISTER_PLUGIN(TARGET mysql_native_password
@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
                 DEFAULT STATIC
                 SOURCES ${AUTH_DIR}/old_password.c)
 
 
+IF(NOT WITHOUT_CLIENT)
 # Cleartext
 REGISTER_PLUGIN(TARGET mysql_clear_password

Lines 1-8 Link Here

(-)mariadb104-server/files/patch-libservices_CMakeLists.txt (-2 / +2 lines)
1	Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options	1	Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
2		2
3	--- libservices/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC	3	--- libservices/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
4	+++ libservices/CMakeLists.txt	4	+++ libservices/CMakeLists.txt
5	@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES	5	@@ -41,4 +41,6 @@ SET(MYSQLSERVICES_SOURCES
6	)	6	)
7		7
8	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})	8	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})

Lines 1-8 Link Here

(-)mariadb104-server/files/patch-man_CMakeLists.txt (-2 / +5 lines)
1	Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options	1	Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
2		2
3	--- man/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC	3	--- man/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
4	+++ man/CMakeLists.txt	4	+++ man/CMakeLists.txt
5	@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys	5	@@ -40,10 +40,11 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl
6		6
7	INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)	7	INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
8	INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)	8	INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
Lines 12-14 Link Here
12	INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)	12	INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
13	-	13	-
14	+ENDIF()	14	+ENDIF()
		15	macro(MARIADB_SYMLINK_MANPAGE)
		16	list(LENGTH MARIADB_SYMLINK_FROMS _len)
		17	math(EXPR _listlen "${_len}-1")




--- mysys/my_default.c.orig	2019-11-07 05:52:22 UTC
+++ mysys/my_default.c
@@ -784,7 +784,7 @@ static int search_default_file_with_ext(Process_option
   {
     MY_STAT stat_info;
     if (!my_stat(name,&stat_info,MYF(0)))

     /*
       Ignore world-writable regular files.
       This is mainly done to protect us to not read a file created by
@@ -802,6 +802,14 @@ static int search_default_file_with_ext(Process_option
   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
     return 1;					/* Ignore wrong files */
 

   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
   {
     line++;
@@ -1066,7 +1074,8 @@ void my_print_default_files(const char *conf_file)
           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
             *end++= '.';
           strxmov(end, conf_file, *ext, " ", NullS);

         }
       }
     }
@@ -1193,13 +1202,10 @@ static const char **init_default_directories(MEM_ROOT 
 
 #else
 

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-pcre_CMakeLists.txt (-2 / +2 lines)
1	--- pcre/CMakeLists.txt.orig 2017-08-17 10:05:39 UTC	1	--- pcre/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
2	+++ pcre/CMakeLists.txt	2	+++ pcre/CMakeLists.txt
3	@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)	3	@@ -483,6 +483,8 @@ IF(PCRE_SHOW_REPORT)
4	MESSAGE(STATUS "")	4	MESSAGE(STATUS "")
5	ENDIF(PCRE_SHOW_REPORT)	5	ENDIF(PCRE_SHOW_REPORT)
6		6

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-scripts_mysql__config.sh (-2 / +2 lines)
1	--- scripts/mysql_config.sh.orig 2017-05-24 09:15:23 UTC	1	--- scripts/mysql_config.sh.orig 2019-11-20 15:04:07 UTC
2	+++ scripts/mysql_config.sh	2	+++ scripts/mysql_config.sh
3	@@ -106,7 +106,9 @@ fi	3	@@ -87,7 +87,9 @@ fi
4		4
5	# Create options	5	# Create options
6	libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"	6	libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-scripts_mysqld__safe.sh (-2 / +2 lines)
1	--- scripts/mysqld_safe.sh.orig 2017-05-24 09:15:23 UTC	1	--- scripts/mysqld_safe.sh.orig 2019-11-20 15:04:07 UTC
2	+++ scripts/mysqld_safe.sh	2	+++ scripts/mysqld_safe.sh
3	@@ -568,11 +568,11 @@ fi	3	@@ -564,11 +564,11 @@ fi
4		4
5	if test -z "$MYSQL_HOME"	5	if test -z "$MYSQL_HOME"
6	then	6	then

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-sql_mysqld.cc (-2 / +2 lines)
1	--- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC	1	--- sql/mysqld.cc.orig 2019-11-07 05:52:22 UTC
2	+++ sql/mysqld.cc	2	+++ sql/mysqld.cc
3	@@ -4838,8 +4840,9 @@ static void init_ssl()	3	@@ -4736,8 +4736,9 @@ static void init_ssl()
4	while ((err= ERR_get_error()))	4	while ((err= ERR_get_error()))
5	sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));	5	sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
6	}	6	}

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-storage_innobase_lz4.cmake (-4 / +3 lines)
1	--- storage/innobase/lz4.cmake.orig 2017-05-14 23:13:18 UTC	1	--- storage/innobase/lz4.cmake.orig 2019-11-07 05:52:22 UTC
2	+++ storage/innobase/lz4.cmake	2	+++ storage/innobase/lz4.cmake
3	@@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING	3	@@ -17,20 +17,28 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
4		4
5	MACRO (MYSQL_CHECK_LZ4)	5	MACRO (MYSQL_CHECK_LZ4)
6	IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")	6	IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
Lines 29-36 Link Here
29	IF (WITH_INNODB_LZ4 STREQUAL "ON")	29	IF (WITH_INNODB_LZ4 STREQUAL "ON")
30	MESSAGE(FATAL_ERROR "Required lz4 library is not found")	30	MESSAGE(FATAL_ERROR "Required lz4 library is not found")
31	ENDIF()	31	ENDIF()
		32	+ ENDIF()
32	ENDIF()	33	ENDIF()
33	+ ENDIF()
34	ENDIF()	34	ENDIF()
35	ENDMACRO()	35	ENDMACRO()
36

Lines 1-9 Link Here

(-)mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt (-3 / +3 lines)
1	From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5	1	From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
2		2
3	--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC	3	--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
4	+++ storage/mroonga/vendor/groonga/CMakeLists.txt	4	+++ storage/mroonga/vendor/groonga/CMakeLists.txt
5	@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM	5	@@ -170,6 +170,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG
6	MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")	6	MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough")
7	endif()	7	endif()
8		8
9	+if(CMAKE_COMPILER_IS_CLANGCXX)	9	+if(CMAKE_COMPILER_IS_CLANGCXX)

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake (-2 / +2 lines)
1	--- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC	1	--- storage/rocksdb/build_rocksdb.cmake.orig 2019-11-07 05:52:23 UTC
2	+++ storage/rocksdb/build_rocksdb.cmake	2	+++ storage/rocksdb/build_rocksdb.cmake
3	@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD	3	@@ -71,10 +71,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD STREQUAL "OFF
4	SET(CMAKE_REQUIRED_LIBRARIES zstd)	4	SET(CMAKE_REQUIRED_LIBRARIES zstd)
5	CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)	5	CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)
6	UNSET(CMAKE_REQUIRED_LIBRARIES)	6	UNSET(CMAKE_REQUIRED_LIBRARIES)

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt (-3 / +3 lines)
1	--- storage/tokudb/CMakeLists.txt.orig 2017-09-25 08:33:26.000000000 +0200	1	--- storage/tokudb/CMakeLists.txt.orig 2019-11-07 05:52:23 UTC
2	+++ storage/tokudb/CMakeLists.txt 2017-09-28 21:46:55.119327000 +0200	2	+++ storage/tokudb/CMakeLists.txt
3	@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA	3	@@ -165,6 +165,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/${TOKU
4		4
5	TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static	5	TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
6	${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)	6	${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt (-2 / +2 lines)
1	--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC	1	--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2019-11-07 05:52:23 UTC
2	+++ storage/tokudb/PerconaFT/CMakeLists.txt	2	+++ storage/tokudb/PerconaFT/CMakeLists.txt
3	@@ -80,7 +80,7 @@ add_subdirectory(src)	3	@@ -99,7 +99,7 @@ add_subdirectory(src)
4	add_subdirectory(ftcxx)	4	add_subdirectory(ftcxx)
5	add_subdirectory(tools)	5	add_subdirectory(tools)
6		6




Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports

--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2019-11-07 05:52:23 UTC
+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
@@ -1,5 +1,12 @@
 include(ExternalProject)
 endif ()
 
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  include_directories("/usr/include")

 ## add lzma with an external project
 set(xz_configure_opts --with-pic --enable-static)
 if (APPLE)
@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
 set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
 add_dependencies(lzma build_lzma)

 ## add snappy with an external project
 set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
 if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
 set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
 add_dependencies(snappy build_snappy)

Lines 1-8 Link Here

(-)mariadb104-server/files/patch-support-files_CMakeLists.txt (-2 / +2 lines)
1	Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options	1	Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
2		2
3	--- support-files/CMakeLists.txt.orig 2017-05-14 23:13:28 UTC	3	--- support-files/CMakeLists.txt.orig 2019-11-07 05:52:24 UTC
4	+++ support-files/CMakeLists.txt	4	+++ support-files/CMakeLists.txt
5	@@ -83,7 +83,9 @@ IF(UNIX)	5	@@ -93,7 +93,9 @@ IF(UNIX)
6	CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)	6	CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
7	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)	7	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
8		8




%%DATADIR%%/ukrainian/errmsg.sys
%%WSREP%%%%DATADIR%%/wsrep.cnf
%%WSREP%%%%DATADIR%%/wsrep_notify
%%DOCSDIR%%/CREDITS
@comment %%DOCSDIR%%/COPYING
%%DOCSDIR%%/EXCEPTIONS-CLIENT
%%DOCSDIR%%/INSTALL-BINARY
%%WSREP%%%%DOCSDIR%%/README-wsrep
%%DOCSDIR%%/README.md
@comment %%DOCSDIR%%/THIRDPARTY
@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
@comment share/groonga/COPYING

Return to bug 241335

Lines 1-7 Link Here

(-)mariadb104-client/files/patch-MDEV-11790 (-3 / +3 lines)
1	WITHOUT_SERVER installs server-only files	1	WITHOUT_SERVER installs server-only files
2		2
3	https://jira.mariadb.org/browse/MDEV-11790	3	https://jira.mariadb.org/browse/MDEV-11790
4	--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC	4	--- extra/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
5	+++ extra/CMakeLists.txt	5	+++ extra/CMakeLists.txt
6	@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)	6	@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
7	ADD_DEPENDENCIES(innochecksum GenError)	7	ADD_DEPENDENCIES(innochecksum GenError)
Lines 12-18 Link Here
12	TARGET_LINK_LIBRARIES(replace mysys)	12	TARGET_LINK_LIBRARIES(replace mysys)
13		13
14	IF(UNIX)	14	IF(UNIX)
15	--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC	15	--- scripts/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
16	+++ scripts/CMakeLists.txt	16	+++ scripts/CMakeLists.txt
17	@@ -241,7 +241,10 @@ ENDIF()	17	@@ -241,7 +241,10 @@ ENDIF()
18	SET(mysql_config_COMPONENT COMPONENT Development)	18	SET(mysql_config_COMPONENT COMPONENT Development)
Lines 25-31 Link Here
25	SET(mytop_COMPONENT Mytop)	25	SET(mytop_COMPONENT Mytop)
26		26
27	IF(WIN32)	27	IF(WIN32)
28	@@ -298,14 +301,14 @@ ELSE()	28	@@ -296,14 +299,14 @@ ELSE()
29	# On Unix, most of the files end up in the bin directory	29	# On Unix, most of the files end up in the bin directory
30	SET(BIN_SCRIPTS	30	SET(BIN_SCRIPTS
31	msql2mysql	31	msql2mysql

Lines 1-7 Link Here

(-)mariadb104-server/files/patch-MDEV-11790 (-3 / +3 lines)
1	WITHOUT_SERVER installs server-only files	1	WITHOUT_SERVER installs server-only files
2		2
3	https://jira.mariadb.org/browse/MDEV-11790	3	https://jira.mariadb.org/browse/MDEV-11790
4	--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC	4	--- extra/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
5	+++ extra/CMakeLists.txt	5	+++ extra/CMakeLists.txt
6	@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)	6	@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
7	ADD_DEPENDENCIES(innochecksum GenError)	7	ADD_DEPENDENCIES(innochecksum GenError)
Lines 12-18 Link Here
12	TARGET_LINK_LIBRARIES(replace mysys)	12	TARGET_LINK_LIBRARIES(replace mysys)
13		13
14	IF(UNIX)	14	IF(UNIX)
15	--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC	15	--- scripts/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
16	+++ scripts/CMakeLists.txt	16	+++ scripts/CMakeLists.txt
17	@@ -241,7 +241,10 @@ ENDIF()	17	@@ -241,7 +241,10 @@ ENDIF()
18	SET(mysql_config_COMPONENT COMPONENT Development)	18	SET(mysql_config_COMPONENT COMPONENT Development)
Lines 25-31 Link Here
25	SET(mytop_COMPONENT Mytop)	25	SET(mytop_COMPONENT Mytop)
26		26
27	IF(WIN32)	27	IF(WIN32)
28	@@ -298,14 +301,14 @@ ELSE()	28	@@ -296,14 +299,14 @@ ELSE()
29	# On Unix, most of the files end up in the bin directory	29	# On Unix, most of the files end up in the bin directory
30	SET(BIN_SCRIPTS	30	SET(BIN_SCRIPTS
31	msql2mysql	31	msql2mysql

Lines 1-22 Link Here

(-)mariadb104-server/files/patch-MDEV-20258 (-22 lines)
1	--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig 2019-07-30 11:32:16.000000000 +0000
2	+++ plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-20 18:31:37.712246000 +0000
3	@@ -15,6 +15,9 @@
4
5	#define N 3
6
7	+typedef unsigned int uint;
8	+typedef unsigned short ushort;
9	+
10	int pam_sm_authenticate(pam_handle_t *pamh, int flags,
11	int argc, const char *argv[])
12	{
13	--- plugin/auth_pam/CMakeLists.txt.orig 2019-07-30 11:32:16.000000000 +0000
14	+++ plugin/auth_pam/CMakeLists.txt 2019-08-23 12:04:17.702326000 +0000
15	@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H)
16	WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
17	COMPONENT Server)
18	ENDIF()
19	- IF(TARGET auth_pam OR TARGET auth_pam_v1)
20	- ADD_SUBDIRECTORY(testing)
21	- ENDIF()
22	ENDIF(HAVE_PAM_APPL_H)

Lines 1-25 Link Here

(-)mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (-14 / +14 lines)
1	--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC	1	--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
2	+++ libmariadb/plugins/auth/CMakeLists.txt	2	+++ libmariadb/plugins/auth/CMakeLists.txt
3	@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)	3	@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
4	LIBRARIES ${GSSAPI_LIBS})	4	INCLUDE_DIRECTORIES(${AUTH_DIR})
5	ENDIF()	5	INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
6		6
7	+IF(NOT WITHOUT_CLIENT)	7	+IF(NOT WITHOUT_CLIENT)
8	IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")	8	SET(CRYPTO_PLUGIN 1)
9	IF(WIN32)	9	IF(WIN32)
10	SET(SHA256_LIBS crypt32)	10	SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
11	@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W	11	@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
12	SOURCES ${AUTH_DIR}/sha256_pw.c	12	ELSE()
13	LIBRARIES ${SHA256_LIBS})	13	UNSET(CRYPTO_PLUGIN)
14	ENDIF()	14	ENDIF()
15	+ENDIF()	15	+ENDIF()
16		16
17	# old_password plugin	17	#native password
18	REGISTER_PLUGIN(TARGET mysql_old_password	18	REGISTER_PLUGIN(TARGET mysql_native_password
19	@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor	19	@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
		20	DEFAULT STATIC
20	SOURCES ${AUTH_DIR}/old_password.c)	21	SOURCES ${AUTH_DIR}/old_password.c)
21		22
22
23	+IF(NOT WITHOUT_CLIENT)	23	+IF(NOT WITHOUT_CLIENT)
24	# Cleartext	24	# Cleartext
25	REGISTER_PLUGIN(TARGET mysql_clear_password	25	REGISTER_PLUGIN(TARGET mysql_clear_password

Lines 1-6 Link Here

(-)mariadb104-server/files/patch-mysys_my__default.c (-5 / +5 lines)
1	--- mysys/my_default.c.orig 2017-05-14 23:13:17 UTC	1	--- mysys/my_default.c.orig 2019-11-07 05:52:22 UTC
2	+++ mysys/my_default.c	2	+++ mysys/my_default.c
3	@@ -785,7 +785,7 @@ static int search_default_file_with_ext(	3	@@ -784,7 +784,7 @@ static int search_default_file_with_ext(Process_option
4	{	4	{
5	MY_STAT stat_info;	5	MY_STAT stat_info;
6	if (!my_stat(name,&stat_info,MYF(0)))	6	if (!my_stat(name,&stat_info,MYF(0)))
Lines 9-15 Link Here
9	/*	9	/*
10	Ignore world-writable regular files.	10	Ignore world-writable regular files.
11	This is mainly done to protect us to not read a file created by	11	This is mainly done to protect us to not read a file created by
12	@@ -803,6 +803,14 @@ static int search_default_file_with_ext(	12	@@ -802,6 +802,14 @@ static int search_default_file_with_ext(Process_option
13	if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))	13	if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
14	return 1; /* Ignore wrong files */	14	return 1; /* Ignore wrong files */
15		15
Lines 24-30 Link Here
24	while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))	24	while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
25	{	25	{
26	line++;	26	line++;
27	@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *	27	@@ -1066,7 +1074,8 @@ void my_print_default_files(const char *conf_file)
28	if (name[0] == FN_HOMELIB) /* Add . to filenames in home */	28	if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
29	*end++= '.';	29	*end++= '.';
30	strxmov(end, conf_file, *ext, " ", NullS);	30	strxmov(end, conf_file, *ext, " ", NullS);
Lines 34-40 Link Here
34	}	34	}
35	}	35	}
36	}	36	}
37	@@ -1192,13 +1201,10 @@ static const char **init_default_directo	37	@@ -1193,13 +1202,10 @@ static const char **init_default_directories(MEM_ROOT
38		38
39	#else	39	#else
40		40

Lines 1-10 Link Here

(-)mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (-6 / +5 lines)
1	Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports	1	Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
2		2
3	--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC	3	--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-07 05:52:23 UTC
4	+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake	4	+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
5	@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB)	5	@@ -1,5 +1,12 @@
6	endif ()	6	include(ExternalProject)
7	endif ()
8		7
9	+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")	8	+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
10	+ include_directories("/usr/include")	9	+ include_directories("/usr/include")
Lines 16-22 Link Here
16	## add lzma with an external project	15	## add lzma with an external project
17	set(xz_configure_opts --with-pic --enable-static)	16	set(xz_configure_opts --with-pic --enable-static)
18	if (APPLE)	17	if (APPLE)
19	@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED)	18	@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
20	set_target_properties(lzma PROPERTIES IMPORTED_LOCATION	19	set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
21	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")	20	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
22	add_dependencies(lzma build_lzma)	21	add_dependencies(lzma build_lzma)
Lines 32-38 Link Here
32	## add snappy with an external project	31	## add snappy with an external project
33	set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")	32	set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
34	if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")	33	if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
35	@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED)	34	@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
36	set_target_properties(snappy PROPERTIES IMPORTED_LOCATION	35	set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
37	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")	36	"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
38	add_dependencies(snappy build_snappy)	37	add_dependencies(snappy build_snappy)

Lines 309-320 Link Here

(-)mariadb104-server/pkg-plist (-3 lines)
309	%%DATADIR%%/ukrainian/errmsg.sys	309	%%DATADIR%%/ukrainian/errmsg.sys
310	%%WSREP%%%%DATADIR%%/wsrep.cnf	310	%%WSREP%%%%DATADIR%%/wsrep.cnf
311	%%WSREP%%%%DATADIR%%/wsrep_notify	311	%%WSREP%%%%DATADIR%%/wsrep_notify
312	%%DOCSDIR%%/CREDITS
313	@comment %%DOCSDIR%%/COPYING	312	@comment %%DOCSDIR%%/COPYING
314	%%DOCSDIR%%/EXCEPTIONS-CLIENT
315	%%DOCSDIR%%/INSTALL-BINARY	313	%%DOCSDIR%%/INSTALL-BINARY
316	%%WSREP%%%%DOCSDIR%%/README-wsrep	314	%%WSREP%%%%DOCSDIR%%/README-wsrep
317	%%DOCSDIR%%/README.md
318	@comment %%DOCSDIR%%/THIRDPARTY	315	@comment %%DOCSDIR%%/THIRDPARTY
319	@comment share/groonga-normalizer-mysql/lgpl-2.0.txt	316	@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
320	@comment share/groonga/COPYING	317	@comment share/groonga/COPYING