FreeBSD Bugzilla – Attachment 168566 Details for
Bug 206998
databases/mysql57-{server,client}: Update to 5.7.12
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Reworked Makefiles
02_bugid_206998_reworked_makefiles.diff (text/plain), 4.18 KB, created by
Markus Kohlmeyer
on 2016-03-24 14:46:45 UTC
(
hide
)
Description:
Reworked Makefiles
Filename:
MIME Type:
Creator:
Markus Kohlmeyer
Created:
2016-03-24 14:46:45 UTC
Size:
4.18 KB
patch
obsolete
>diff -Naur mysql57-client/Makefile mysql57-client/Makefile >--- mysql57-client/Makefile 2016-03-24 12:36:22.623469000 +0100 >+++ mysql57-client/Makefile 2016-03-24 12:59:37.652048000 +0100 >@@ -2,6 +2,7 @@ > # $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $ > > PORTNAME= mysql >+PORTREVISION?= 1 > PKGNAMESUFFIX= 57-client > > COMMENT= Multithreaded SQL database (client) >@@ -14,12 +15,12 @@ > PATCHDIR= ${.CURDIR}/files > PLIST= ${.CURDIR}/pkg-plist > >-CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-* >+CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ >+ mysql[0-46-9][0-9]-client-* \ >+ mariadb[0-9][0-9]-client-* \ >+ percona[0-9][0-9]-client-* > >-CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ >- -DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \ >- -DWITHOUT_SERVER=1 \ >- -DWITH_SYSTEMD=0 >+CMAKE_ARGS+= -DWITHOUT_SERVER=1 > > USE_LDCONFIG+= ${PREFIX}/lib/mysql > >diff -Naur mysql57-server/Makefile mysql57-server/Makefile >--- mysql57-server/Makefile 2016-03-24 12:35:39.805527000 +0100 >+++ mysql57-server/Makefile 2016-03-24 13:20:48.777681000 +0100 >@@ -3,6 +3,7 @@ > > PORTNAME= mysql > PORTVERSION= 5.7.11 >+PORTREVISION?= 1 > CATEGORIES= databases ipv6 > MASTER_SITES= MYSQL/MySQL-5.7 > PKGNAMESUFFIX?= 57-server >@@ -15,7 +16,7 @@ > LICENSE= GPLv2 > > SLAVEDIRS= databases/mysql57-client >-USES= cmake:outsource shebangfix >+USES= cmake:outsource shebangfix libedit > > OPTIONS_RADIO= SSL ZLIB > OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL >@@ -28,15 +29,21 @@ > BUNDLED_ZLIB_DESC= Use bundled ZLib > SYSTEM_ZLIB_DESC= Use system ZLib > >+LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 >+ >+CMAKE_BUILD_TYPE= Release >+ > CMAKE_ARGS+= -DINSTALL_LAYOUT=STANDALONE \ >+ -DINSTALL_LDCONFIGDIR=${LOCALBASE}/libdata/ldconfig \ >+ -DINSTALL_PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \ > -DINSTALL_DOCDIR="share/doc/mysql" \ > -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ > -DINSTALL_INCLUDEDIR="include/mysql" \ > -DINSTALL_INFODIR="info" \ > -DINSTALL_LIBDIR="lib/mysql" \ >- -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" \ >@@ -44,8 +51,11 @@ > -DINSTALL_SCRIPTDIR="bin" \ > -DINSTALL_SHAREDIR="share" \ > -DINSTALL_SUPPORTFILESDIR="share/mysql" \ >+ -DMYSQL_KEYRINGDIR=${PREFIX}/etc/mysql/keyring \ >+ -DSYSCONFDIR=${PREFIX}/etc/mysql \ > -DWITH_BOOST=${WRKSRC}/boost \ >- -DWITH_INNODB_EXTRA_DEBUG=0 >+ -DWITH_EDITLINE=system \ >+ -DWITH_LIBEVENT=system > > SHEBANG_FILES= scripts/*.pl* scripts/*.sh > >@@ -67,9 +77,10 @@ > USES+= bison:build cpe perl5 > USE_PERL5= run > >-CONFLICTS_INSTALL= mariadb[0-9]*-server-* \ >- mysql[0-46-9][0-689]-server-* \ >- percona[0-9]*-server-* >+CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \ >+ mysql[0-46-9][0-9]-server-* \ >+ mariadb[0-9][0-9]-server-* \ >+ percona[0-9][0-9]-server-* > > USE_RC_SUBR= mysql-server > >@@ -81,7 +92,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 > >@@ -115,13 +126,6 @@ > > PERFSCHM_SUB_LIST+= PERFSCHEMRC="" > PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" >- >-.else >-USES+= libedit >-LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 >- >-CMAKE_ARGS+= -DWITH_EDITLINE=system \ >- -DWITH_LIBEVENT=system > .endif > > .include <bsd.port.pre.mk> >@@ -136,7 +140,7 @@ > .endif > > post-extract: >- @${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h >+ @${RM} -f ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h > > post-patch: > @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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