On Mon, Nov 06, 2023 at 10:03:22AM +0000, Stuart Henderson wrote:
> Tried it before, this update breaks mariadb.
libfmt is still behind, perhaps we want to stick to mariadb's 8.0.1 bundle?
It'd be a downgrade from ports 8.1.1, but mariadb builds and libfmt could
be updated.
Just a tiny .cmake patch and usual DISTFILES goo.
Builds, but I don't use MariaDB.
Thoughts?
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
diff -u -p -r1.143 Makefile
--- Makefile 20 Sep 2023 13:30:06 -0000 1.143
+++ Makefile 14 Jan 2024 18:50:25 -0000
@@ -1,6 +1,9 @@
COMMENT-main= multithreaded SQL database (client)
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
+REVISION-main= 0
+REVISION-server=0
+REVISION-tests= 0
VERSION= 10.9.6
DISTNAME= mariadb-${VERSION}
@@ -10,6 +13,13 @@ CATEGORIES= databases
SITES= https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
+# ${WRKSRC}/cmake/libfmt.cmake
+SITES.fmt= https://github.com/fmtlib/fmt/archive/refs/tags/
+FMT_V= 8.0.1
+DISTFILES.fmt= fmt-${FMT_V}{${FMT_V}}.zip
+EXTRACT_ONLY= ${DISTFILES}
+CONFIGURE_ARGS= -DLIBFMT_URL=file://${FULLDISTDIR}/fmt-${FMT_V}.zip
+
LIB_VERSION= 30
SHARED_LIBS= mysqlclient_r ${LIB_VERSION}.0 \
mysqlclient ${LIB_VERSION}.0 \
@@ -37,8 +47,7 @@ SOCKET_DIR= /var/run/mysql
SUBST_VARS= SOCKET_DIR
MODULES= devel/cmake
-BUILD_DEPENDS= devel/bison \
- devel/fmt
+BUILD_DEPENDS= devel/bison
LIB_DEPENDS-main= ${LIB_DEPENDS}
RUN_DEPENDS-server= ${BASE_PKGPATH},-main>=10.9v1,<10.10v1 \
@@ -77,6 +86,7 @@ CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="
-DCOMPILATION_COMMENT='OpenBSD port: ${FULLPKGNAME-server}' \
-DPLUGIN_OQGRAPH=NO \
-DWITH_EXTERNAL_ZLIB=On \
+ -DWITH_FMT=bundled \
-DWITH_PCRE=system \
-DWITH_SSL=system \
-DWITH_WSREP=On \
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mariadb/distinfo,v
diff -u -p -r1.59 distinfo
--- distinfo 15 May 2023 11:03:57 -0000 1.59
+++ distinfo 14 Jan 2024 18:50:28 -0000
@@ -1,2 +1,4 @@
+SHA256 (fmt-8.0.1.zip) = Z0dELBiQZLhXM2AH3X+jqvWFEqoaCyuna/EYLu+wECU=
SHA256 (mariadb-10.9.6.tar.gz) = /m9Sh/zMamW4u8yuCehB4F3AdvzBMBcHiFTKOH6riuk=
+SIZE (fmt-8.0.1.zip) = 871270
SIZE (mariadb-10.9.6.tar.gz) = 96164395
Index: patches/patch-cmake_libfmt_cmake
===================================================================
RCS file: patches/patch-cmake_libfmt_cmake
diff -N patches/patch-cmake_libfmt_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_libfmt_cmake 14 Jan 2024 18:59:49 -0000
@@ -0,0 +1,14 @@
+Supply prefetched libfmt bundle
+
+Index: cmake/libfmt.cmake
+--- cmake/libfmt.cmake.orig
++++ cmake/libfmt.cmake
+@@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT)
+ ExternalProject_Add(
+ libfmt
+ PREFIX "${dir}"
+- URL "https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip";
++ URL "${LIBFMT_URL}"
+ URL_MD5 e77873199e897ca9f780479ad68e25b1
+ INSTALL_COMMAND ""
+ CONFIGURE_COMMAND ""
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-server,v
diff -u -p -r1.53 PLIST-server
--- pkg/PLIST-server 15 May 2023 11:03:57 -0000 1.53
+++ pkg/PLIST-server 14 Jan 2024 19:41:57 -0000
@@ -675,6 +675,7 @@ share/mysql/korean/
share/mysql/korean/errmsg.sys
share/mysql/maria_add_gis_sp.sql
share/mysql/maria_add_gis_sp_bootstrap.sql
+%%rocksdb%%
share/mysql/mysql_performance_tables.sql
share/mysql/mysql_sys_schema.sql
share/mysql/mysql_system_tables.sql
@@ -704,4 +705,3 @@ share/mysql/swedish/errmsg.sys
share/mysql/ukrainian/
share/mysql/ukrainian/errmsg.sys
%%le%%
-%%rocksdb%%
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-tests,v
diff -u -p -r1.64 PLIST-tests
--- pkg/PLIST-tests 15 May 2023 11:03:57 -0000 1.64
+++ pkg/PLIST-tests 14 Jan 2024 19:42:06 -0000
@@ -3741,6 +3741,7 @@ share/mysql-test/plugin/metadata_lock_in
share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/global_read_lock.test
share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/table_metadata_lock.test
share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/user_lock.test
+%%rocksdb%%
share/mysql-test/plugin/myisam/
share/mysql-test/plugin/myisam/mtr2/
share/mysql-test/plugin/myisam/mtr2/README
@@ -17097,4 +17098,3 @@ share/mysql-test/suite/wsrep/t/wsrep_var
share/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.test
share/mysql-test/valgrind.supp
%%le%%
-%%rocksdb%%
