Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_17147297006700"
MIME-Version: 1.0
Date: Fri, 3 May 2024 09:48:20 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/databases/mariadb1011-client
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240503094820.22C9AFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_17147297006700
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri May  3 09:48:20 UTC 2024

Modified Files:
	pkgsrc/databases/mariadb1011-client: Makefile distinfo
Added Files:
	pkgsrc/databases/mariadb1011-client/patches: patch-cmake_libfmt.cmake

Log Message:
mariadb1011-client: disable broken libfmt detection

Makes it use pkgsrc libfmt again and not trying to download an older
version during the build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb1011-client/Makefile \
    pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake

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


--_----------=_17147297006700
Content-Disposition: inline
Content-Length: 3706
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/databases/mariadb1011-client/Makefile
diff -u pkgsrc/databases/mariadb1011-client/Makefile:1.4 pkgsrc/databases/mariadb1011-client/Makefile:1.5
--- pkgsrc/databases/mariadb1011-client/Makefile:1.4	Tue Jan 23 09:52:05 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile	Fri May  3 09:48:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/01/23 09:52:05 nia Exp $
+# $NetBSD: Makefile,v 1.5 2024/05/03 09:48:19 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
 COMMENT=	MariaDB 10.11, a free MySQL compatible database (client)
@@ -8,6 +8,7 @@ CONFLICTS=	mysql-client-[0-9]*
 .include "Makefile.common"
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=ON
+CMAKE_ARGS+=	-DWITH_LIBFMT=system
 
 INSTALL_DIRS+=	client include libmariadb man scripts
 
Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.4 pkgsrc/databases/mariadb1011-client/distinfo:1.5
--- pkgsrc/databases/mariadb1011-client/distinfo:1.4	Wed Apr 10 19:24:05 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo	Fri May  3 09:48:19 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/04/10 19:24:05 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/05/03 09:48:19 wiz Exp $
 
 BLAKE2s (mariadb-10.11.7.tar.gz) = 66a70689bd177e2b4c886b9fdda7426314c767207408d2ded8d8f4f6714ab3d5
 SHA512 (mariadb-10.11.7.tar.gz) = a6ebc9ba88b52e5d339b176b6fa48c03fcbe5bb590740a02c1bbd083a3d62e619937e645de2504a9f9adeed2f67127fab0307dece524b7c5217ad5df0f3ccc71
@@ -7,6 +7,7 @@ SHA1 (patch-BUILD_compile-pentium32-gcov
 SHA1 (patch-CMakeLists.txt) = 9bdc3c88521b9bd217d37d286950a71ae0d0e1e0
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
+SHA1 (patch-cmake_libfmt.cmake) = 2337c62c19d625b44e5082d0f1cae6afde708601
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f

Added files:

Index: pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake:1.1
--- /dev/null	Fri May  3 09:48:20 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake	Fri May  3 09:48:19 2024
@@ -0,0 +1,36 @@
+$NetBSD: patch-cmake_libfmt.cmake,v 1.1 2024/05/03 09:48:19 wiz Exp $
+
+Disable broken libfmt detection.
+
+--- cmake/libfmt.cmake.orig	2024-05-03 09:45:28.584587681 +0000
++++ cmake/libfmt.cmake
+@@ -25,28 +25,7 @@ MACRO(BUNDLE_LIBFMT)
+ ENDMACRO()
+ 
+ MACRO (CHECK_LIBFMT)
+-  IF(WITH_LIBFMT STREQUAL "system" OR WITH_LIBFMT STREQUAL "auto")
+-    SET(CMAKE_REQUIRED_INCLUDES ${LIBFMT_INCLUDE_DIR})
+-    CHECK_CXX_SOURCE_RUNS(
+-    "#define FMT_STATIC_THOUSANDS_SEPARATOR ','
+-     #define FMT_HEADER_ONLY 1
+-     #include <fmt/format-inl.h>
+-     int main() {
+-       int answer= 4321;
+-       fmt::format_args::format_arg arg=
+-         fmt::detail::make_arg<fmt::format_context>(answer);
+-       return fmt::vformat(\"{:L}\", fmt::format_args(&arg, 1)).compare(\"4,321\");
+-     }" HAVE_SYSTEM_LIBFMT)
+-    SET(CMAKE_REQUIRED_INCLUDES)
+-  ENDIF()
+-  IF(NOT HAVE_SYSTEM_LIBFMT OR WITH_LIBFMT STREQUAL "bundled")
+-    IF (WITH_LIBFMT STREQUAL "system")
+-      MESSAGE(FATAL_ERROR "system libfmt library is not found or unusable")
+-    ENDIF()
+-    BUNDLE_LIBFMT()
+-  ELSE()
+-    FIND_FILE(Libfmt_core_h fmt/core.h) # for build_depends.cmake
+-  ENDIF()
++  FIND_FILE(Libfmt_core_h fmt/core.h) # for build_depends.cmake
+ ENDMACRO()
+ 
+ MARK_AS_ADVANCED(LIBFMT_INCLUDE_DIR)


--_----------=_17147297006700--