Attachment 150765 Details for Bug 196122 – Patch for databases/mariadb100-server

[patch] Patch for databases/mariadb100-server

patch-mariadb100-server (text/plain), 1.80 KB, created by Bernard Spil on 2014-12-19 14:43:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2014-12-19 14:43:43 UTC

Size: 1.80 KB

patch

obsolete

>--- Makefile.orig	2014-12-17 08:10:58.000000000 +0100
>+++ Makefile	2014-12-19 14:59:52.857613596 +0100
>@@ -26,13 +26,15 @@
> 
> BROKEN_arm=	Does not compile on arm
> 
>-OPTIONS_DEFINE=		INNODB SSL OPENSSL PORTSSL FASTMTX
>-OPTIONS_DEFAULT=	SSL
>+OPTIONS_DEFINE=		FASTMTX
>+OPTIONS_RADIO=		SSL
>+OPTIONS_RADIO_SSL=	WITHOUT_SSL BUNDLED_SSL OPENSSL
>+OPTIONS_DEFAULT+=	OPENSSL
> NO_OPTIONS_SORT=	yes
> 
> 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)
>+WITHOUT_SSL_DESC=	No SSL/TLS support
>+BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
> 
> CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
>@@ -81,25 +83,15 @@
> CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
> .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}
>+.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
>+.elif ${PORT_OPTIONS:MBUNDLED_SSL}
> CMAKE_ARGS+=	-DWITH_SSL=bundled
>-.  endif
>-.else
>+.elif ${PORT_OPTIONS:MWITHOUT_SSL}
> CMAKE_FLAGS+=	-DWITH_SSL=no
>+.else
>+CMAKE_FLAGS+=   -DWITH_SSL=no
> .endif
> 
> .if ${PORT_OPTIONS:MFASTMTX}
>@@ -112,7 +104,9 @@
> .else
> # MySQL-Server part
> 
>-CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
>+CONFLICTS_INSTALL=	mysql*-server-* \
>+			mariadb[0-9][0-9]-server-* \
>+			percona*-server-*
> 
> USE_MYSQL=	yes
> WANT_MYSQL_VER=	100m

Actions: View | Diff

Attachments on bug 196122: 150753 | 150754 | 150765 | 150766 | 150767 | 151636 | 151637 | 151638 | 151670