pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases Add -DCONNECT_WITH_MONGO=NO to mariadb10{4,5...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bb2b32e372e1
branches: trunk
changeset: 770766:bb2b32e372e1
user: abs <abs%pkgsrc.org@localhost>
date: Wed Dec 08 15:11:31 2021 +0000
description:
Add -DCONNECT_WITH_MONGO=NO to mariadb10{4,5,6}-server
Avoids build failure if monogb 4.x is installed.
Someone can always add a mongodb option to options.mk if they want, but
this is just to ensure reliable builds
diffstat:
databases/mariadb104-server/Makefile | 4 +++-
databases/mariadb105-server/Makefile | 4 +++-
databases/mariadb106-server/Makefile | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diffs (54 lines):
diff -r 4b1f21930ee4 -r bb2b32e372e1 databases/mariadb104-server/Makefile
--- a/databases/mariadb104-server/Makefile Wed Dec 08 14:51:47 2021 +0000
+++ b/databases/mariadb104-server/Makefile Wed Dec 08 15:11:31 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/10/21 07:46:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2021/12/08 15:11:32 abs Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 2
@@ -38,6 +38,8 @@
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
+CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
+
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}
diff -r 4b1f21930ee4 -r bb2b32e372e1 databases/mariadb105-server/Makefile
--- a/databases/mariadb105-server/Makefile Wed Dec 08 14:51:47 2021 +0000
+++ b/databases/mariadb105-server/Makefile Wed Dec 08 15:11:31 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/11/27 22:52:15 nia Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/08 15:11:31 abs Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= MariaDB 10.5, a free MySQL compatible database (server)
@@ -37,6 +37,8 @@
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
+CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
+
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}
diff -r 4b1f21930ee4 -r bb2b32e372e1 databases/mariadb106-server/Makefile
--- a/databases/mariadb106-server/Makefile Wed Dec 08 14:51:47 2021 +0000
+++ b/databases/mariadb106-server/Makefile Wed Dec 08 15:11:31 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/11/27 23:40:28 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/12/08 15:11:31 abs Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= MariaDB 10.6, a free MySQL compatible database (server)
@@ -37,6 +37,8 @@
SMF_NAME= mariadb
SMF_METHODS= ${RCD_SCRIPTS}
+CMAKE_ARGS+= -DCONNECT_WITH_MONGO=NO
+
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
FILES_SUBST+= MARIADB_DATADIR=${MARIADB_DATADIR}
FILES_SUBST+= MARIADB_USER=${MARIADB_USER} MARIADB_GROUP=${MARIADB_GROUP}
Home |
Main Index |
Thread Index |
Old Index