Attachment 167010 Details for Bug 206998 – more bugfixes, enhancements, suggestions

[patch] more bugfixes, enhancements, suggestions

mysql57-moreoptions.diff (text/plain), 3.47 KB, created by Markus Kohlmeyer on 2016-02-15 01:53:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-02-15 01:53:23 UTC

Size: 3.47 KB

patch

obsolete

>--- mysql57-server/Makefile	2016-02-14 21:49:34.806858000 +0100
>+++ mysql57-server/Makefile	2016-02-15 02:38:18.330376000 +0100
>@@ -17,19 +17,29 @@
> SLAVEDIRS=	databases/mysql57-client
> USES=		cmake:outsource shebangfix
> 
>-OPTIONS_RADIO=		SSL ZLIB
>-OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
>-OPTIONS_DEFAULT+=	OPENSSL BUNDLED_ZLIB
>-OPTIONS_RADIO_ZLIB=	BUNDLED_ZLIB SYSTEM_ZLIB
>+OPTIONS_RADIO=      SSL LIBEDIT LIBEVENT LZ4 ZLIB
>+OPTIONS_RADIO_SSL=  BUNDLED_SSL OPENSSL WITHOUT_SSL
>+OPTIONS_RADIO_LIBEDIT=  BUNDLED_LIBEDIT SYSTEM_LIBEDIT
>+OPTIONS_RADIO_LIBEVENT=  BUNDLED_LIBEVENT SYSTEM_LIBEVENT
>+OPTIONS_RADIO_LZ4=  BUNDLED_LZ4 SYSTEM_LZ4
>+OPTIONS_RADIO_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB
>+OPTIONS_DEFAULT+=   OPENSSL BUNDLED_LIBEDIT BUNDLED_LIBEVENT BUNDLED_LZ4 BUNDLED_ZLIB
> 
> NO_OPTIONS_SORT=	yes
> 
> BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
> WITHOUT_SSL_DESC=	No SSL/TLS support
>+BUNDLED_LIBEDIT_DESC=	Use bundled libedit
>+SYSTEM_LIBEDIT_DESC=	Use system libedit
>+BUNDLED_LIBEVENT_DESC=	Use bundled libevent
>+SYSTEM_LIBEVENT_DESC=	Use system libevent
>+BUNDLED_LZ4_DESC=	Use bundled lz4 lib
>+SYSTEM_LZ4_DESC=	Use system lz4 lib
> BUNDLED_ZLIB_DESC=	Use bundled zlib
> SYSTEM_ZLIB_DESC=	Use system zlib
> 
>-CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
>+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RELEASE \
>+		-DINSTALL_LAYOUT=STANDALONE \
> 		-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
> 		-DINSTALL_INCLUDEDIR="include/mysql" \
>@@ -38,6 +48,7 @@
> 		-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
> 		-DINSTALL_MANDIR="man" \
> 		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
>+		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
> 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
> 		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
> 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
>@@ -45,9 +56,12 @@
> 		-DINSTALL_SCRIPTDIR="bin" \
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
>-		-DWITH_INNODB_EXTRA_DEBUG=0 \
>+		-DMYSQL_DATADIR="/var/db/mysql" \
>+		-DMYSQL_KEYRINGDIR=${PREFIX}/etc/mysql/keyring \
>+		-DSYSCONFDIR=${PREFIX}/etc/mysql \
> 		-DWITH_BOOST=${WRKSRC}/boost \
>-		-DWITH_LIBEVENT=system
>+		-DWITH_PIC=1 \
>+		-DWITH_UNIT_TEST=0
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
>@@ -59,6 +73,15 @@
> OPENSSL_USE=		OPENSSL=yes
> WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
> 
>+BUNDLED_LIBEDIT_CMAKE_ON=	-DWITH_LIBEDIT=bundled
>+SYSTEM_LIBEDIT_CMAKE_ON=	-DWITH_LIBEDIT=system
>+
>+BUNDLED_LIBEVENT_CMAKE_ON=	-DWITH_LIBEVENT=bundled
>+SYSTEM_LIBEVENT_CMAKE_ON=	-DWITH_LIBEVENT=system
>+
>+BUNDLED_LZ4_CMAKE_ON=	-DWITH_LZ4=bundled
>+SYSTEM_LZ4_CMAKE_ON=	-DWITH_LZ4=system
>+
> BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
> SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
> 
>@@ -67,7 +90,7 @@
> USE_MYSQL=	yes
> WANT_MYSQL_VER=	57
> 
>-USES+=		bison:build cpe perl5
>+USES+=		bison:build cpe libedit perl5
> USE_PERL5=	run
> 
> CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
>@@ -84,7 +107,7 @@
> 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 \
>- 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
>+		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
> 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
> 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
> 
>@@ -121,7 +144,6 @@
> 
> .else
> USES+=		libedit
>-CMAKE_ARGS+=	-DWITH_EDITLINE=system
> .endif
> 
> .include <bsd.port.pre.mk>

Actions: View | Diff

Attachments on bug 206998: 166699 | 166705 | 166778 | 166801 | 166802 | 166853 | 166996 | 166997 | 167010 | 167027 | 168565 | 168566 | 168567 | 168568 | 168570 | 168572 | 169320 | 169321 | 169324 | 169325 | 169343 | 169433 | 169437 | 169592 | 169598 | 169982 | 169994 | 170041