Attachment 164978 Details for Bug 205815 – explicitly set BOOST_INCLUDE_DIR

[patch] explicitly set BOOST_INCLUDE_DIR

mysq57-boost.diff (text/plain), 1.21 KB, created by Mikhail Teterin on 2016-01-03 03:25:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2016-01-03 03:25:24 UTC

Size: 1.21 KB

patch

obsolete

>Index: mysql57-client/Makefile
>===================================================================
>--- mysql57-client/Makefile	(revision 405108)
>+++ mysql57-client/Makefile	(working copy)
>@@ -14,7 +14,6 @@
> PATCHDIR=	${.CURDIR}/files
> PLIST=		${.CURDIR}/pkg-plist
> 
>-CONFLICTS_BUILD=	boost-libs-1.55*
> 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-*
> 
> CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
>Index: mysql57-server/Makefile
>===================================================================
>--- mysql57-server/Makefile	(revision 405108)
>+++ mysql57-server/Makefile	(working copy)
>@@ -40,7 +40,8 @@
> 		-DINSTALL_SCRIPTDIR="bin" \
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
>-		-DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \
>+		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
>+		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
> 		-DWITH_INNODB_EXTRA_DEBUG=0
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
>@@ -61,7 +62,6 @@
> USES+=		bison:build cpe perl5
> USE_PERL5=	run
> 
>-CONFLICTS_BUILD=	boost-libs-1.55*
> CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
> 			mysql[0-46-9][0-689]-server-* \
> 			percona[0-9]*-server-*

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 205815: 164978 | 165102