Attachment 165161 Details for Bug 205956 – Fixes missing binary_log_types.h

[patch] Fixes missing binary_log_types.h

mysql57-include.patch (text/plain), 2.90 KB, created by Steven Hartland on 2016-01-06 15:57:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Hartland

Created: 2016-01-06 15:57:02 UTC

Size: 2.90 KB

patch

obsolete

>Index: mysql57-client/Makefile
>===================================================================
>--- mysql57-client/Makefile	(revision 405341)
>+++ mysql57-client/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mysql
> PKGNAMESUFFIX=	57-client
>+PORTREVISION=	3
> 
> COMMENT=	Multithreaded SQL database (client)
> 
>@@ -14,7 +15,9 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
> 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-57-9]-client-* \
>+			mariadb*-client-* \
>+			percona*-client-*
> 
> CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
> 		-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
>Index: mysql57-client/files/patch-include_CMakeLists.txt
>===================================================================
>--- mysql57-client/files/patch-include_CMakeLists.txt	(revision 405341)
>+++ mysql57-client/files/patch-include_CMakeLists.txt	(working copy)
>@@ -8,11 +8,3 @@
>    my_dbug.h 
>    m_string.h
>    my_sys.h 
>-@@ -68,7 +69,6 @@ SET(HEADERS 
>-   ${HEADERS_GEN_CONFIGURE}
>- )
>- 
>--INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
>- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
>-  PATTERN "*.h"
>Index: mysql57-client/pkg-plist
>===================================================================
>--- mysql57-client/pkg-plist	(revision 405341)
>+++ mysql57-client/pkg-plist	(working copy)
>@@ -10,6 +10,7 @@ bin/mysqlimport
> bin/mysqlpump
> bin/mysqlshow
> bin/mysqlslap
>+include/mysql/binary_log_types.h
> include/mysql/big_endian.h
> include/mysql/byte_order_generic.h
> include/mysql/byte_order_generic_x86.h
>Index: mysql57-server/Makefile
>===================================================================
>--- mysql57-server/Makefile	(revision 405341)
>+++ mysql57-server/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mysql
> PORTVERSION=	5.7.10
>-PORTREVISION=	1
>+PORTREVISION?=	2
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
> PKGNAMESUFFIX?=	57-server
>@@ -119,7 +119,7 @@ OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
> USE_CLANG=	3.3+
> 
> post-extract:
>-	${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
>+	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
>Index: mysql57-server/pkg-plist
>===================================================================
>--- mysql57-server/pkg-plist	(revision 405341)
>+++ mysql57-server/pkg-plist	(working copy)
>@@ -19,7 +19,6 @@ bin/replace
> bin/resolve_stack_dump
> bin/resolveip
> bin/zlib_decompress
>-include/mysql/binary_log_types.h
> lib/mysql/libmysqld.a
> lib/mysql/plugin/adt_null.so
> lib/mysql/plugin/auth.so

Actions: View | Diff

Attachments on bug 205956: 165157 | 165159 | 165161 | 165305 | 166454 | 166493 | 166494