Attachment 167005 Details for Bug 207197 – Backports of current and upcomming Makefile changes from 5.7.11

[patch] Backports of current and upcomming Makefile changes from 5.7.11

mysql56-update.diff (text/plain), 5.03 KB, created by Markus Kohlmeyer on 2016-02-14 23:36:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-02-14 23:36:35 UTC

Size: 5.03 KB

patch

obsolete

>--- mysql56-client/Makefile	2016-02-14 23:08:42.414300000 +0100
>+++ mysql56-client/Makefile	2016-02-15 00:10:36.653974000 +0100
>@@ -12,13 +12,13 @@
> PATCHDIR=	${.CURDIR}/files
> PLIST=		${.CURDIR}/pkg-plist
> 
>-CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
>-			mariadb*-client-* \
>-			percona*-client-*
>+CONFLICTS_INSTALL=	mariadb[0-9]*-client-* \
>+			mysql[0-46-9][0-57-9]-client-* \
>+			percona[0-9]*-client-*
> 
> CMAKE_ARGS+=	-DWITHOUT_SERVER=1
> 
>-USE_LDCONFIG=	${PREFIX}/lib/mysql
>+USE_LDCONFIG+=	${PREFIX}/lib/mysql
> 
> MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
> 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
>--- mysql56-server/Makefile	2016-02-14 23:08:42.417485000 +0100
>+++ mysql56-server/Makefile	2016-02-15 00:21:27.363267000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.6.27
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.6
> PKGNAMESUFFIX?=	56-server
>@@ -12,9 +12,22 @@
> COMMENT?=	Multithreaded SQL database (server)
> 
> SLAVEDIRS=	databases/mysql56-client
>-USES=		cmake shebangfix
>+USES=		cmake:outsource shebangfix
> 
>-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
>+OPTIONS_RADIO=		SSL ZLIB
>+OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
>+OPTIONS_DEFAULT+=	OPENSSL BUNDLED_ZLIB
>+OPTIONS_RADIO_ZLIB=	BUNDLED_ZLIB SYSTEM_ZLIB
>+
>+NO_OPTIONS_SORT=	yes
>+
>+BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
>+WITHOUT_SSL_DESC=	No SSL/TLS support
>+BUNDLED_ZLIB_DESC=	Use bundled zlib
>+SYSTEM_ZLIB_DESC=	Use system zlib
>+
>+CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
>+		-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
> 		-DINSTALL_INCLUDEDIR="include/mysql" \
> 		-DINSTALL_INFODIR="info" \
>@@ -29,8 +42,7 @@
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SQLBENCHDIR="share/mysql" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
>-		-DWITH_EDITLINE=system \
>-		-DWITH_LIBWRAP=1
>+		-DWITH_LIBEVENT=system
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
>@@ -38,6 +50,13 @@
> .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
> .endif
> 
>+BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
>+OPENSSL_USE=		OPENSSL=yes
>+WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
>+
>+BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
>+SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
>+
> # MySQL-Server part
> .if !defined(CLIENT_ONLY)
> USE_MYSQL=	yes
>@@ -46,15 +65,17 @@
> USES+=		perl5
> USE_PERL5=	run
> 
>-CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
>-			mariadb*-server-* \
>-			percona*-server-*
>+CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
>+			mysql[0-46-9][0-57-9]-server-* \
>+			percona[0-9]*-server-*
> 
> USE_RC_SUBR=	mysql-server
> 
> USERS=		mysql
> GROUPS=		mysql
> 
>+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
>+
> MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
> 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
> 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
>@@ -63,17 +84,57 @@
> 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
> 
> CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
>+
>+OPTIONS_GROUP=		STORAGE
>+OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
>+OPTIONS_SUB=		YES
>+STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
>+ARCHIVE_DESC=		Compile "Archive Storage" statically in server
>+BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
>+EXAMPLE_DESC=		Compile "Example Storage" statically in server
>+FEDERATED_DESC=		Compile "Federated Storage" statically in server
>+INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
>+PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
>+PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
>+
>+ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
>+BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
>+EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
>+FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
>+INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
>+PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
>+PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
>+
>+OPTIONS_GROUP+=		FEATURES
>+OPTIONS_GROUP_FEATURES=	PERFSCHM
>+FEATURES_DESC=		Default features knobs
>+PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
>+OPTIONS_DEFAULT+=	PERFSCHM
>+
>+PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
>+PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
>+
> .else
> USES+=		libedit
>+CMAKE_ARGS+=	-DWITH_EDITLINE=system
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
>-
> .include <bsd.port.pre.mk>
> 
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
>+CC=	clang
>+CXX=	clang++
>+CPP=	clang-cpp
>+OPENSSL_CMAKE_ON=	-DWITH_SSL=system
>+.elif ${OSVERSION} >= 1000000
>+OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
>+.endif
>+
> .if ${ARCH} == "armv6"
> EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
>+
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 207197: 167005