CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 10 May 2021 14:15:55 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 10 14:15:55 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb104-client: Makefile Makefile.common
            buildlink3.mk
        pkgsrc/databases/mariadb104-server: Makefile PLIST
Added Files:
        pkgsrc/databases/mariadb104-server: options.mk
Removed Files:
        pkgsrc/databases/mariadb104-client: TODO

Log Message:
mariadb104: Split options.mk for both packages, pointed out by wiz

While here try to strip down the build a bit...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb104-client/Makefile \
    pkgsrc/databases/mariadb104-client/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb104-client/Makefile.common
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mariadb104-client/TODO
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb104-server/Makefile \
    pkgsrc/databases/mariadb104-server/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/mariadb104-server/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb104-client/Makefile
diff -u pkgsrc/databases/mariadb104-client/Makefile:1.1 pkgsrc/databases/mariadb104-client/Makefile:1.2
--- pkgsrc/databases/mariadb104-client/Makefile:1.1     Sat May  8 19:47:16 2021
+++ pkgsrc/databases/mariadb104-client/Makefile Mon May 10 14:15:55 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2021/05/10 14:15:55 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
+PKGREVISION=   1
 COMMENT=       MariaDB 10.4, a free SQL database (client)
 
 CONFLICTS=     mysql-client-[0-9]*
@@ -11,4 +12,5 @@ CMAKE_ARGS+=  -DWITHOUT_SERVER=ON
 
 INSTALL_DIRS+= client include libmariadb man scripts
 
+.include "options.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/mariadb104-client/buildlink3.mk
diff -u pkgsrc/databases/mariadb104-client/buildlink3.mk:1.1 pkgsrc/databases/mariadb104-client/buildlink3.mk:1.2
--- pkgsrc/databases/mariadb104-client/buildlink3.mk:1.1        Sat May  8 19:47:16 2021
+++ pkgsrc/databases/mariadb104-client/buildlink3.mk    Mon May 10 14:15:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/05/10 14:15:55 nia Exp $
 
 # This buildlink file uses mysql-client and not mariadb-client,
 # because some packages depending on it expect BUILDLINK_*.mysql-client
@@ -6,8 +6,8 @@
 # instead.
 BUILDLINK_TREE+=       mysql-client
 
-.if !defined(MARIADB_CLIENT_BUILDLINK3_MK)
-MARIADB_CLIENT_BUILDLINK3_MK:=
+.if !defined(MYSQL_CLIENT_BUILDLINK3_MK)
+MYSQL_CLIENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mysql-client+=   mariadb-client>=10.4.0
 BUILDLINK_ABI_DEPENDS.mysql-client+=   mariadb-client>=10.4.0
@@ -22,6 +22,6 @@ pkgbase := mariadb-client
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 .include "../../devel/zlib/buildlink3.mk"
-.endif # MARIADB_CLIENT_BUILDLINK3_MK
+.endif # MYSQL_CLIENT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -mysql-client

Index: pkgsrc/databases/mariadb104-client/Makefile.common
diff -u pkgsrc/databases/mariadb104-client/Makefile.common:1.2 pkgsrc/databases/mariadb104-client/Makefile.common:1.3
--- pkgsrc/databases/mariadb104-client/Makefile.common:1.2      Sat May  8 19:57:39 2021
+++ pkgsrc/databases/mariadb104-client/Makefile.common  Mon May 10 14:15:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2021/05/08 19:57:39 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/05/10 14:15:55 nia Exp $
 #
 # used by databases/mariadb104-client/Makefile
 # used by databases/mariadb104-server/Makefile
@@ -53,6 +53,10 @@ MARIADB_EXTRA_CHARSET?=      all
 
 BUILD_DEFS+=           VARBASE
 
+CMAKE_ARGS+=           -DCOMPILATION_COMMENT="pkgsrc"
+
+CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE="Release"
+
 CMAKE_ARGS+=           -DINSTALL_BINDIR="bin"
 CMAKE_ARGS+=           -DINSTALL_DOCDIR="share/doc/mysql"
 CMAKE_ARGS+=           -DINSTALL_DOCREADMEDIR="share/doc/mysql"
@@ -70,12 +74,20 @@ CMAKE_ARGS+=                -DINSTALL_SUPPORTFILESDIR=
 CMAKE_ARGS+=           -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}"
 CMAKE_ARGS+=           -DMYSQL_DATADIR=${MARIADB_DATADIR}
 
+CMAKE_ARGS+=           -DWITH_UNIT_TESTS=OFF
 CMAKE_ARGS+=           -DWITH_LIBWRAP=ON
+CMAKE_ARGS+=           -DWITH_SSL="system"
 CMAKE_ARGS+=           -DWITH_ZLIB="system"
 CMAKE_ARGS+=           -DDEFAULT_CHARSET=${MARIADB_CHARSET}
 CMAKE_ARGS+=           -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q}
 CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q}
 
+CMAKE_ARGS+=           -DPLUGIN_EXAMPLE=NO
+CMAKE_ARGS+=           -DPLUGIN_FEEDBACK=NO
+
+# Requires Java
+CMAKE_ARGS+=           -DCONNECT_WITH_JDBC=OFF
+
 # Options which affect generation of includes
 CMAKE_ARGS+=           -DWITH_ARIA_STORAGE_ENGINE=ON
 CMAKE_ARGS+=           -DWITH_PARTITION_STORAGE_ENGINE=ON
@@ -111,8 +123,6 @@ CHECK_PORTABILITY_SKIP+=    BUILD/compile-p
 PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
 PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
 
-.include "options.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/databases/mariadb104-server/Makefile
diff -u pkgsrc/databases/mariadb104-server/Makefile:1.1 pkgsrc/databases/mariadb104-server/Makefile:1.2
--- pkgsrc/databases/mariadb104-server/Makefile:1.1     Sat May  8 19:47:16 2021
+++ pkgsrc/databases/mariadb104-server/Makefile Mon May 10 14:15:55 2021
@@ -1,23 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2021/05/10 14:15:55 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       MariaDB 10.4, a free SQL database (server)
 
 CONFLICTS=     mysql-server-[0-9]*
 
 .include "../../databases/mariadb104-client/Makefile.common"
 
-.if !empty(PKG_OPTIONS:Membedded-server)
-CMAKE_ARGS+=                   -DWITH_EMBEDDED_SERVER=ON
-PLIST_SRC+=                    PLIST.embedded
-.else
-CMAKE_ARGS+=                   -DWITH_EMBEDDED_SERVER=OFF
-# We only need readline to placate the configure script if we don't build
-# the embedded server as it is the only binary linked against "readline".
-BUILDLINK_DEPMETHOD.editline=  build
-BUILDLINK_DEPMETHOD.readline=  build
-.endif
-
 CMAKE_ARGS+=           -DPYTHON_SHEBANG=${PYTHONBIN}
 
 BUILD_DEFS+=           VARBASE
@@ -72,6 +62,7 @@ REPLACE_BASH+=                scripts/mariadb-service-
 post-install:
        ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db
 
+.include "options.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../databases/mariadb104-client/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
Index: pkgsrc/databases/mariadb104-server/PLIST
diff -u pkgsrc/databases/mariadb104-server/PLIST:1.1 pkgsrc/databases/mariadb104-server/PLIST:1.2
--- pkgsrc/databases/mariadb104-server/PLIST:1.1        Sat May  8 19:47:16 2021
+++ pkgsrc/databases/mariadb104-server/PLIST    Mon May 10 14:15:55 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/05/10 14:15:55 nia Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -293,7 +293,6 @@ lib/mysql/plugin/file_key_management.so
 lib/mysql/plugin/ha_archive.so
 lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_connect.so
-lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_federated.so
 lib/mysql/plugin/ha_federatedx.so
 lib/mysql/plugin/ha_oqgraph.so

Added files:

Index: pkgsrc/databases/mariadb104-server/options.mk
diff -u /dev/null pkgsrc/databases/mariadb104-server/options.mk:1.1
--- /dev/null   Mon May 10 14:15:55 2021
+++ pkgsrc/databases/mariadb104-server/options.mk       Mon May 10 14:15:55 2021
@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.1 2021/05/10 14:15:55 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mariadb-server
+
+PKG_SUPPORTED_OPTIONS+=        embedded-server ssl
+PKG_SUGGESTED_OPTIONS+=        embedded-server ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Membedded-server)
+.include "../../devel/readline/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_EMBEDDED_SERVER=ON
+PLIST_SRC+=    PLIST.embedded
+.else
+CMAKE_ARGS+=   -DWITH_EMBEDDED_SERVER=OFF
+.endif
+
+# Enable OpenSSL support
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_SSL=system
+.else
+CMAKE_ARGS+=   -DWITH_SSL=no
+.endif

Prev by Date: CVS commit: pkgsrc/www/py-websockets
Next by Date: CVS commit: pkgsrc/databases/mariadb104-client
Previous by Thread: CVS commit: pkgsrc/www/py-websockets
Next by Thread: CVS commit: pkgsrc/databases/mariadb104-client
Indexes:

Home | Main Index | Thread Index | Old Index