Sun Jul 4 10:14:54 2021 UTC ()
mariadb*: Disable embedded-server on SunOS


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

--- pkgsrc/databases/mariadb104-server/Makefile 2021/05/26 11:24:56 1.7
+++ pkgsrc/databases/mariadb104-server/Makefile 2021/07/04 10:14:54 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2021/05/26 11:24:56 nia Exp $ 1# $NetBSD: Makefile,v 1.8 2021/07/04 10:14:54 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 4 4PKGREVISION= 5
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.3 -r1.4 pkgsrc/databases/mariadb104-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb104-server/options.mk 2021/05/26 11:24:56 1.3
+++ pkgsrc/databases/mariadb104-server/options.mk 2021/07/04 10:14:54 1.4
@@ -1,20 +1,27 @@ @@ -1,20 +1,27 @@
1# $NetBSD: options.mk,v 1.3 2021/05/26 11:24:56 nia Exp $ 1# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 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
 8.include "../../mk/bsd.fast.prefs.mk"
 9
 10.if ${OPSYS} != "SunOS"
7PKG_SUGGESTED_OPTIONS+= embedded-server ssl 11PKG_SUGGESTED_OPTIONS+= embedded-server ssl
 12.else
 13PKG_SUGGESTED_OPTIONS+= ssl
 14.endif
8 15
9.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
10 17
11.if !empty(PKG_OPTIONS:Mcolumnstore) 18.if !empty(PKG_OPTIONS:Mcolumnstore)
12.include "../../devel/boost-headers/buildlink3.mk" 19.include "../../devel/boost-headers/buildlink3.mk"
13CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES 20CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
14.else 21.else
15CMAKE_ARGS+= -DDPLUGIN_COLUMNSTORE=NO 22CMAKE_ARGS+= -DDPLUGIN_COLUMNSTORE=NO
16.endif 23.endif
17 24
18PLIST_VARS+= embedded 25PLIST_VARS+= embedded
19.if !empty(PKG_OPTIONS:Membedded-server) 26.if !empty(PKG_OPTIONS:Membedded-server)
20CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 27CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
cvs diff -r1.6 -r1.7 pkgsrc/databases/mariadb105-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mariadb105-server/Makefile 2021/07/04 08:58:30 1.6
+++ pkgsrc/databases/mariadb105-server/Makefile 2021/07/04 10:14:54 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.6 2021/07/04 08:58:30 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2021/07/04 10:14:54 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 3 4PKGREVISION= 4
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.3 -r1.4 pkgsrc/databases/mariadb105-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb105-server/options.mk 2021/05/25 15:51:21 1.3
+++ pkgsrc/databases/mariadb105-server/options.mk 2021/07/04 10:14:54 1.4
@@ -1,20 +1,27 @@ @@ -1,20 +1,27 @@
1# $NetBSD: options.mk,v 1.3 2021/05/25 15:51:21 nia Exp $ 1# $NetBSD: options.mk,v 1.4 2021/07/04 10:14:54 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
 8.include "../../mk/bsd.fast.prefs.mk"
 9
 10.if ${OPSYS} != "SunOS"
7PKG_SUGGESTED_OPTIONS+= embedded-server ssl 11PKG_SUGGESTED_OPTIONS+= embedded-server ssl
 12.else
 13PKG_SUGGESTED_OPTIONS+= ssl
 14.endif
8 15
9.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
10 17
11.if !empty(PKG_OPTIONS:Mcolumnstore) 18.if !empty(PKG_OPTIONS:Mcolumnstore)
12.include "../../devel/boost-headers/buildlink3.mk" 19.include "../../devel/boost-headers/buildlink3.mk"
13CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES 20CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=YES
14.else 21.else
15CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO 22CMAKE_ARGS+= -DPLUGIN_COLUMNSTORE=NO
16.endif 23.endif
17 24
18PLIST_VARS+= embedded 25PLIST_VARS+= embedded
19.if !empty(PKG_OPTIONS:Membedded-server) 26.if !empty(PKG_OPTIONS:Membedded-server)
20CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 27CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON