Mon Jul 12 22:40:00 2021 UTC ()
mariadb*: Disable embedded server by default.

It is off by default upstream and doesn't seem to work well with
any non-GNU linker.


(nia)
diff -r1.9 -r1.10 pkgsrc/databases/mariadb104-server/Makefile
diff -r1.4 -r1.5 pkgsrc/databases/mariadb104-server/options.mk
diff -r1.7 -r1.8 pkgsrc/databases/mariadb105-server/Makefile
diff -r1.4 -r1.5 pkgsrc/databases/mariadb105-server/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/databases/mariadb104-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mariadb104-server/Makefile 2021/07/04 10:58:59 1.9
+++ pkgsrc/databases/mariadb104-server/Makefile 2021/07/12 22:39:59 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2021/07/04 10:58:59 nia Exp $ 1# $NetBSD: Makefile,v 1.10 2021/07/12 22:39:59 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 6 4PKGREVISION= 7
5COMMENT= MariaDB 10.4, a free MySQL compatible database (server) 5COMMENT= MariaDB 10.4, a free MySQL compatible database (server)
6 6
7CONFLICTS= mysql-server-[0-9]* 7CONFLICTS= mysql-server-[0-9]*
8 8
9.include "../../databases/mariadb104-client/Makefile.common" 9.include "../../databases/mariadb104-client/Makefile.common"
10 10
11BUILD_DEFS+= VARBASE 11BUILD_DEFS+= VARBASE
12 12
13.include "../../mk/bsd.fast.prefs.mk" 13.include "../../mk/bsd.fast.prefs.mk"
14 14
15MARIADB_USER?= ${MYSQL_USER:Umariadb} 15MARIADB_USER?= ${MYSQL_USER:Umariadb}
16MARIADB_GROUP?= ${MYSQL_GROUP:Umariadb} 16MARIADB_GROUP?= ${MYSQL_GROUP:Umariadb}
17 17
cvs diff -r1.4 -r1.5 pkgsrc/databases/mariadb104-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb104-server/options.mk 2021/07/04 10:14:54 1.4
+++ pkgsrc/databases/mariadb104-server/options.mk 2021/07/12 22:39:59 1.5
@@ -1,27 +1,23 @@ @@ -1,27 +1,23 @@
1# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 nia Exp $ 1# $NetBSD: options.mk,v 1.5 2021/07/12 22:39:59 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server
4 4
5PKG_SUPPORTED_OPTIONS+= columnstore embedded-server lzo lz4 oqgraph rocksdb 5PKG_SUPPORTED_OPTIONS+= columnstore embedded-server lzo lz4 oqgraph rocksdb
6PKG_SUPPORTED_OPTIONS+= snappy ssl zstd 6PKG_SUPPORTED_OPTIONS+= snappy ssl zstd
7 7
8.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
9 9
10.if ${OPSYS} != "SunOS" 10PKG_SUGGESTED_OPTIONS= ssl
11PKG_SUGGESTED_OPTIONS+= embedded-server ssl 
12.else 
13PKG_SUGGESTED_OPTIONS+= ssl 
14.endif 
15 11
16.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
17 13
18.if !empty(PKG_OPTIONS:Mcolumnstore) 14.if !empty(PKG_OPTIONS:Mcolumnstore)
19.include "../../devel/boost-headers/buildlink3.mk" 15.include "../../devel/boost-headers/buildlink3.mk"
20CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES 16CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
21.else 17.else
22CMAKE_ARGS+= -DDPLUGIN_COLUMNSTORE=NO 18CMAKE_ARGS+= -DDPLUGIN_COLUMNSTORE=NO
23.endif 19.endif
24 20
25PLIST_VARS+= embedded 21PLIST_VARS+= embedded
26.if !empty(PKG_OPTIONS:Membedded-server) 22.if !empty(PKG_OPTIONS:Membedded-server)
27CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 23CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
cvs diff -r1.7 -r1.8 pkgsrc/databases/mariadb105-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mariadb105-server/Makefile 2021/07/04 10:14:54 1.7
+++ pkgsrc/databases/mariadb105-server/Makefile 2021/07/12 22:40:00 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2021/07/04 10:14:54 nia Exp $ 1# $NetBSD: Makefile,v 1.8 2021/07/12 22:40:00 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 4 4PKGREVISION= 5
5COMMENT= MariaDB 10.5, a free MySQL compatible database (server) 5COMMENT= MariaDB 10.5, a free MySQL compatible database (server)
6 6
7CONFLICTS= mysql-server-[0-9]* 7CONFLICTS= mysql-server-[0-9]*
8 8
9.include "../../databases/mariadb105-client/Makefile.common" 9.include "../../databases/mariadb105-client/Makefile.common"
10 10
11BUILD_DEFS+= VARBASE 11BUILD_DEFS+= VARBASE
12 12
13.include "../../mk/bsd.fast.prefs.mk" 13.include "../../mk/bsd.fast.prefs.mk"
14 14
15MARIADB_USER?= ${MYSQL_USER:Umariadb} 15MARIADB_USER?= ${MYSQL_USER:Umariadb}
16MARIADB_GROUP?= ${MYSQL_GROUP:Umariadb} 16MARIADB_GROUP?= ${MYSQL_GROUP:Umariadb}
17 17
cvs diff -r1.4 -r1.5 pkgsrc/databases/mariadb105-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb105-server/options.mk 2021/07/04 10:14:54 1.4
+++ pkgsrc/databases/mariadb105-server/options.mk 2021/07/12 22:40:00 1.5
@@ -1,27 +1,23 @@ @@ -1,27 +1,23 @@
1# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 nia Exp $ 1# $NetBSD: options.mk,v 1.5 2021/07/12 22:40:00 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.mysql-server
4 4
5PKG_SUPPORTED_OPTIONS+= columnstore embedded-server lzo lz4 oqgraph rocksdb 5PKG_SUPPORTED_OPTIONS+= columnstore embedded-server lzo lz4 oqgraph rocksdb
6PKG_SUPPORTED_OPTIONS+= snappy ssl zstd 6PKG_SUPPORTED_OPTIONS+= snappy ssl zstd
7 7
8.include "../../mk/bsd.fast.prefs.mk" 8.include "../../mk/bsd.fast.prefs.mk"
9 9
10.if ${OPSYS} != "SunOS" 10PKG_SUGGESTED_OPTIONS= ssl
11PKG_SUGGESTED_OPTIONS+= embedded-server ssl 
12.else 
13PKG_SUGGESTED_OPTIONS+= ssl 
14.endif 
15 11
16.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
17 13
18.if !empty(PKG_OPTIONS:Mcolumnstore) 14.if !empty(PKG_OPTIONS:Mcolumnstore)
19.include "../../devel/boost-headers/buildlink3.mk" 15.include "../../devel/boost-headers/buildlink3.mk"
20CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES 16CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
21.else 17.else
22CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO 18CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
23.endif 19.endif
24 20
25PLIST_VARS+= embedded 21PLIST_VARS+= embedded
26.if !empty(PKG_OPTIONS:Membedded-server) 22.if !empty(PKG_OPTIONS:Membedded-server)
27CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 23CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON