Attachment #174839 for bug #212690

Lines 2-8 Link Here

(-)databases/mysql57-client/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTREVISION?= 1	5	PORTREVISION?= 0
6	PKGNAMESUFFIX= 57-client	6	PKGNAMESUFFIX= 57-client
7		7
8	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)




--- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
+++ cmake/build_configurations/compiler_options.cmake
@@ -29,7 +29,7 @@ IF(UNIX)  
 
   # Default GCC flags
   IF(CMAKE_COMPILER_IS_GNUCC)

     # Disable inline optimizations for valgrind testing to avoid false positives
     IF(WITH_VALGRIND)
       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
@@ -42,7 +42,7 @@ IF(UNIX)  
     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
   ENDIF()
   IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
     # GCC 6 has C++14 as default, set it explicitly to the old default.
     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
                     OUTPUT_VARIABLE GXX_VERSION)




--- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
+++ mysys_ssl/my_default.cc
@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
 
 /* Which directories are searched for options (and in which order) */
 

 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
 static const char **default_directories = NULL;
 
@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
       return 1;                                 /* Ignore wrong files */
   }
 

+      goto err;
+  }
+
   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
   {
     line++;
@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
             end[(strlen(end)-1)] = ' ';
           else
             strxmov(end, conf_file, *ext , " ",  NullS);

         }
       }
     }
@@ -1411,13 +1420,8 @@ static const char **init_default_directo
 
 #else
 

 
 #endif
 
@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
   MY_STAT stat_info;
 
   if (!my_stat(file_name,&stat_info,MYF(0)))




# $FreeBSD$

PORTNAME?=	mysql
PORTVERSION=	5.7.15
PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	MYSQL/MySQL-5.7
PKGNAMESUFFIX?=	57-server

		-DWITH_EDITLINE=system \
		-DWITH_LIBEVENT=system \
		-DWITH_LZ4=system \
		-DWITH_ZLIB=system \
		-DINSTALL_MYSQLTESTDIR=0

SHEBANG_FILES=	scripts/*.pl* scripts/*.sh


PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
.endif

.include <bsd.port.options.mk>

### Just for the sake of FreeBSD 9.X ###
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000

.  if !defined(CLIENT_ONLY)
EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
.  endif
### Just like deperecated `WITH_OPENSSL_PORT=yes` a workaround for building on 9.X ###
DEFAULT_VERSIONS+=ssl=openssl
.endif

.include <bsd.port.pre.mk>

.if ${SSL_DEFAULT} == base
BROKEN_FreeBSD_9=	FreeBSD 9.x requires SSL from ports
CMAKE_ARGS+=		-DWITH_SSL=system

Lines 1-3 Link Here

(-)databases/mysql57-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1465065317	1	TIMESTAMP = 1473858917
2	SHA256 (mysql-boost-5.7.13.tar.gz) = 2a768682c37dfbca286912bd137f1a526075ac1f00a6a46da8b6fe63f6fcfa37	2	SHA256 (mysql-boost-5.7.15.tar.gz) = 7342a3a3e40878378dfaee252d42a3a5b06c58237f49c2544424d27316738945
3	SIZE (mysql-boost-5.7.13.tar.gz) = 60561931	3	SIZE (mysql-boost-5.7.15.tar.gz) = 60583907




--- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
+++ mysys_ssl/my_default.cc
@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
 
 /* Which directories are searched for options (and in which order) */
 

 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
 static const char **default_directories = NULL;
 
@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
       return 1;                                 /* Ignore wrong files */
   }
 

+      goto err;
+  }
+
   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
   {
     line++;
@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
             end[(strlen(end)-1)] = ' ';
           else
             strxmov(end, conf_file, *ext , " ",  NullS);

         }
       }
     }
@@ -1411,13 +1420,8 @@ static const char **init_default_directo
 
 #else
 

 
 #endif
 
@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
   MY_STAT stat_info;
 
   if (!my_stat(file_name,&stat_info,MYF(0)))




--- rapid/plugin/x/mysqlx_configure.cmake.orig	2016-09-14 15:25:26 UTC
+++ rapid/plugin/x/mysqlx_configure.cmake
@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
 CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
 
+IF(FALSE)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
         DESTINATION ${INSTALL_INCLUDEDIR}
         COMPONENT Developement)
@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
         DESTINATION ${INSTALL_INCLUDEDIR}
         COMPONENT Developement)
+ENDIF()

Lines 1-11 Link Here

(-)databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake (-11 lines)
1	--- rapid/plugin/x/mysqlx_error.cmake.orig 2016-04-14 21:38:55 UTC
2	+++ rapid/plugin/x/mysqlx_error.cmake
3	@@ -26,6 +26,8 @@ GENERATE_XERRORS(${MYSQLX_PROJECT_DIR}/s
4	CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_error.h.in
5	${CMAKE_CURRENT_BINARY_DIR}/mysqlx_error.h)
6
7	+IF(FALSE)
8	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqlx_error.h
9	DESTINATION ${INSTALL_INCLUDEDIR}
10	COMPONENT Developement)
11	+ENDIF()

Lines 1-4 Link Here

(-)databases/mysql57-server/files/patch-sql_CMakeLists.txt (-2 / +2 lines)
1	--- sql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC	1	--- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC
2	+++ sql/CMakeLists.txt	2	+++ sql/CMakeLists.txt
3	@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(	3	@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
4	${ZLIB_INCLUDE_DIR}	4	${ZLIB_INCLUDE_DIR}
Lines 6-11 Link Here
6	${CMAKE_BINARY_DIR}/sql	6	${CMAKE_BINARY_DIR}/sql
7	+ ${CMAKE_BINARY_DIR}/include	7	+ ${CMAKE_BINARY_DIR}/include
8	+ ${CMAKE_BINARY_DIR}	8	+ ${CMAKE_BINARY_DIR}
		9	${LZ4_INCLUDE_DIR}
9	)	10	)
10		11
11	SET(CONF_SOURCES

Return to bug 212690

Lines 1-6 Link Here

(-)databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake (-6 / +6 lines)
1	--- cmake/build_configurations/compiler_options.cmake.orig 2016-03-28 18:06:12 UTC	1	--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC
2	+++ cmake/build_configurations/compiler_options.cmake	2	+++ cmake/build_configurations/compiler_options.cmake
3	@@ -28,7 +28,7 @@ IF(UNIX)	3	@@ -29,7 +29,7 @@ IF(UNIX)
4		4
5	# Default GCC flags	5	# Default GCC flags
6	IF(CMAKE_COMPILER_IS_GNUCC)	6	IF(CMAKE_COMPILER_IS_GNUCC)
Lines 9-20 Link Here
9	# Disable inline optimizations for valgrind testing to avoid false positives	9	# Disable inline optimizations for valgrind testing to avoid false positives
10	IF(WITH_VALGRIND)	10	IF(WITH_VALGRIND)
11	SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")	11	SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
12	@@ -37,7 +37,7 @@ IF(UNIX)	12	@@ -42,7 +42,7 @@ IF(UNIX)
13	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")	13	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
14	ENDIF()	14	ENDIF()
15	IF(CMAKE_COMPILER_IS_GNUCXX)	15	IF(CMAKE_COMPILER_IS_GNUCXX)
16	- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")	16	- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
17	+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")	17	+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
18	# Disable inline optimizations for valgrind testing to avoid false positives	18	# GCC 6 has C++14 as default, set it explicitly to the old default.
19	IF(WITH_VALGRIND)	19	EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
20	SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")	20	OUTPUT_VARIABLE GXX_VERSION)

Lines 1-6 Link Here

(-)databases/mysql57-client/files/patch-mysys__ssl_my__default.cc (-7 / +7 lines)
1	--- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC	1	--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
2	+++ mysys_ssl/my_default.cc	2	+++ mysys_ssl/my_default.cc
3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;	3	@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
4		4
5	/* Which directories are searched for options (and in which order) */	5	/* Which directories are searched for options (and in which order) */
6		6
Lines 9-15 Link Here
9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */	9	#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
10	static const char **default_directories = NULL;	10	static const char **default_directories = NULL;
11		11
12	@@ -909,6 +909,14 @@	12	@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
13	return 1; /* Ignore wrong files */	13	return 1; /* Ignore wrong files */
14	}	14	}
15		15
Lines 21-30 Link Here
21	+ goto err;	21	+ goto err;
22	+ }	22	+ }
23	+	23	+
24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp))	24	while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
25	{	25	{
26	line++;	26	line++;
27	@@ -1245,7 +1253,8 @@	27	@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
28	end[(strlen(end)-1)] = ' ';	28	end[(strlen(end)-1)] = ' ';
29	else	29	else
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	@@ -1404,13 +1413,8 @@	37	@@ -1411,13 +1420,8 @@ static const char **init_default_directo
38		38
39	#else	39	#else
40		40
Lines 50-56 Link Here
50		50
51	#endif	51	#endif
52		52
53	@@ -1480,7 +1484,7 @@	53	@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
54	MY_STAT stat_info;	54	MY_STAT stat_info;
55		55
56	if (!my_stat(file_name,&stat_info,MYF(0)))	56	if (!my_stat(file_name,&stat_info,MYF(0)))

Lines 2-9 Link Here

(-)databases/mysql57-server/Makefile (-4 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 5.7.13	5	PORTVERSION= 5.7.15
6	PORTREVISION?= 1	6	PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7	8	MASTER_SITES= MYSQL/MySQL-5.7
9	PKGNAMESUFFIX?= 57-server	9	PKGNAMESUFFIX?= 57-server
Lines 55-61 Link Here
55	-DWITH_EDITLINE=system \	55	-DWITH_EDITLINE=system \
56	-DWITH_LIBEVENT=system \	56	-DWITH_LIBEVENT=system \
57	-DWITH_LZ4=system \	57	-DWITH_LZ4=system \
58	-DWITH_ZLIB=system	58	-DWITH_ZLIB=system \
		59	-DINSTALL_MYSQLTESTDIR=0
59		60
60	SHEBANG_FILES= scripts/.pl scripts/*.sh	61	SHEBANG_FILES= scripts/.pl scripts/*.sh
61		62
Lines 128-134 Link Here
128	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"	129	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
129	.endif	130	.endif
130		131
131	.include <bsd.port.pre.mk>	132	.include <bsd.port.options.mk>
132		133
133	### Just for the sake of FreeBSD 9.X ###	134	### Just for the sake of FreeBSD 9.X ###
134	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000	135	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
Lines 135-142 Link Here
135	. if !defined(CLIENT_ONLY)	136	. if !defined(CLIENT_ONLY)
136	EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc	137	EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
137	. endif	138	. endif
		139	### Just like deperecated `WITH_OPENSSL_PORT=yes` a workaround for building on 9.X ###
		140	DEFAULT_VERSIONS+=ssl=openssl
138	.endif	141	.endif
139		142
		143	.include <bsd.port.pre.mk>
		144
140	.if ${SSL_DEFAULT} == base	145	.if ${SSL_DEFAULT} == base
141	BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports	146	BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports
142	CMAKE_ARGS+= -DWITH_SSL=system	147	CMAKE_ARGS+= -DWITH_SSL=system

Line 0 Link Here

(-)databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (+15 lines)
	1	--- rapid/plugin/x/mysqlx_configure.cmake.orig 2016-09-14 15:25:26 UTC
	2	+++ rapid/plugin/x/mysqlx_configure.cmake
	3	@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
	4	CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
	5	${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
	6
	7	+IF(FALSE)
	8	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
	9	DESTINATION ${INSTALL_INCLUDEDIR}
	10	COMPONENT Developement)
	11	@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
	12	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
	13	DESTINATION ${INSTALL_INCLUDEDIR}
	14	COMPONENT Developement)
	15	+ENDIF()