Attachment 151633 Details for Bug 196125 – Patch for databases/mariadb55-server

[patch] Patch for databases/mariadb55-server

patch-mariadb55-server (text/plain), 5.08 KB, created by Bernard Spil on 2015-01-14 19:51:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-01-14 19:51:59 UTC

Size: 5.08 KB

patch

obsolete

>--- Makefile.orig	2014-11-25 10:57:29.000000000 +0100
>+++ Makefile	2015-01-14 20:28:08.747200513 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/databases/mariadb55-server/Makefile 373396 2014-11-25 09:57:29Z marino $
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	5.5.40
>+PORTVERSION=	5.5.41
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
> 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
>@@ -23,14 +23,6 @@
> SLAVEDIRS=	databases/mariadb55-client
> USES=		cmake execinfo gmake shebangfix
> SHEBANG_FILES=	scripts/*.sh
>-NO_OPTIONS_SORT=yes
>-
>-OPTIONS_DEFINE+=	SSL OPENSSL PORTSSL FASTMTX
>-OPTIONS_DEFAULT+=	SSL
>-
>-FASTMTX_DESC=	Replace mutexes with spinlocks
>-OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
>-PORTSSL_DESC=	Use OpenSSL from port (requires OPENSSL to be set)
> 
> CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
>@@ -53,56 +45,16 @@
> 		-DEXECINFO_ROOT=${LOCALBASE} \
> 		-DCOMPILATION_COMMENT="FreeBSD Ports"
> 
>-.ifdef USE_MYSQL
>-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
>-.endif
>-
> DATADIR=	${PREFIX}/share/mysql
> 
>-# MySQL-Server options
>-.if !defined(CLIENT_ONLY)
>-OPTIONS_DEFINE+=	OQGRAPH MAXKEY
>-
>-OQGRAPH_DESC=	Open Query Graph Computation engine
>-MAXKEY_DESC=	Change max key length from 1000 to 4000
>-
>-OPTIONS_DEFAULT+=	MAXKEY
>-.endif
>-
>-.include <bsd.port.options.mk>
>+BROKEN_armv6=		Does not compile on arm
> 
>-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
>-CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
>-.else
>-CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
>+.if defined(USE_MYSQL)
>+.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
> .endif
> 
>-.if ${PORT_OPTIONS:MSSL}
>-.if exists(${LOCALBASE}/include/openssl/opensslv.h)
>-.  if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
>-IGNORE=	security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
>-.  endif
>-.endif
>-.if ${PORT_OPTIONS:MOPENSSL}
>-USE_OPENSSL=	yes
>-.if !${PORT_OPTIONS:MPORTSSL}
>-WITH_OPENSSL_BASE=	yes
>-.else
>-WITH_OPENSSL_PORT=	yes
>-.endif
>-CMAKE_ARGS+=	-DWITH_SSL=yes
>-.else
>-CMAKE_ARGS+=	-DWITH_SSL=bundled
>-.endif
>-.else
>-CMAKE_FLAGS+=	-DWITH_SSL=no
>-.endif
>-.if ${PORT_OPTIONS:MFASTMTX}
>-CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
>-.endif
>-
>-# MySQL-Server part
> .if !defined(CLIENT_ONLY)
>+# MySQL-Server part
> USE_MYSQL=	yes
> WANT_MYSQL_VER=	55m
> 
>@@ -119,25 +71,55 @@
> CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
> 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
> 
>-post-install:
>-.if !defined(PACKAGE_BUILDING)
>-	@${CAT} ${PKGMESSAGE}
>-.endif
>-
>-.if empty(PORT_OPTIONS:MOQGRAPH)
>-CMAKE_ARGS+=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
>-PLIST_SUB+=	OQGRAPH="@comment "
> .else
>-USE_GCC?=	yes
>-CMAKE_ARGS+=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
>-PLIST_SUB+=	OQGRAPH=""
>-LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
>+# MySQL-Client part
>+USES+=		readline
> .endif
>-.if ${PORT_OPTIONS:MMAXKEY}
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my_compare.h
>+
>+OPTIONS_DEFINE+=	FASTMTX
>+OPTIONS_RADIO=		SSL
>+OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
>+OPTIONS_DEFAULT+=	OPENSSL
>+OPTIONS_SUB=		yes
>+NO_OPTIONS_SORT=yes
>+
>+BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
>+FASTMTX_DESC=	Replace mutexes with spinlocks
>+WITHOUT_SSL_DESC=	No SSL/TLS support
>+OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
>+OPENSSL_USE=		USE_OPENSSL=yes
>+BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
>+WITHOUT_SSL_CMAKE=	-DWITH_SSL=no
>+
>+FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
>+
>+.if !defined(CLIENT_ONLY)
>+# MySQL-Server options
>+OPTIONS_DEFINE+=	MAXKEY OQGRAPH
>+OPTIONS_DEFAULT+=	MAXKEY
>+
>+MAXKEY_DESC=	Change max key length from 1000 to 4000
>+OQGRAPH_DESC=	Open Query Graph Computation engine
>+
>+OQGRAPH_CMAKE_OFF=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
>+OQGRAPH_USE=	GCC=yes
>+OQGRAPH_CMAKE_ON=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
>+OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
>+
>+MAXKEY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include_my_compare.h
> .endif
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
>+CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
> .else
>-USES+=		readline
>+CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
>+.endif
>+
>+# Server segfaults on i386 when built with clang >= 3.4
>+.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000
>+USE_GCC=        yes
> .endif
> 
> post-patch:
>@@ -145,10 +127,4 @@
> 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
> 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "arm"
>-BROKEN=		Does not compile on arm
>-.endif
>-
> .include <bsd.port.post.mk>
>--- distinfo.orig	2014-11-22 19:46:05.000000000 +0100
>+++ distinfo	2015-01-14 20:37:32.927098028 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (mariadb-5.5.40.tar.gz) = cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a
>-SIZE (mariadb-5.5.40.tar.gz) = 44745240
>+SHA256 (mariadb-5.5.41.tar.gz) = a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332
>+SIZE (mariadb-5.5.41.tar.gz) = 45526003

Actions: View | Diff

Attachments on bug 196125: 150762 | 150768 | 150769 | 151633 | 151634 | 151635 | 151639