CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Dec 13 14:07:45 UTC 2024

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

Log Message:
mariadb: Restore libfmt detection patch on applicable versions


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb114-client/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/databases/mariadb114-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.

Modified files:

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.12 pkgsrc/databases/mariadb1011-client/distinfo:1.13
--- pkgsrc/databases/mariadb1011-client/distinfo:1.12   Tue Dec 10 18:23:08 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Fri Dec 13 14:07:45 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2024/12/10 18:23:08 nia Exp $
+$NetBSD: distinfo,v 1.13 2024/12/13 14:07:45 nia Exp $
 
 BLAKE2s (mariadb-10.11.10.tar.gz) = 07830db81c463489dc3b005ab899b1aa29bc445806bc862ee6cb59ca2b1c9a4e
 SHA512 (mariadb-10.11.10.tar.gz) = 3a8655384813ba515ce185e8a03427785fbea75b3226e2a1db02839dd66c22622ba27eeb2ca7b3d840bba43720a4393bbf71eb4b2b9e41ab837629e89a8b5976
@@ -7,6 +7,7 @@ SHA1 (patch-BUILD_compile-pentium32-gcov
 SHA1 (patch-CMakeLists.txt) = b41fc869c3ebf0b13138a566a03080a0f3475551
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
+SHA1 (patch-cmake_libfmt.cmake) = 5b33ee5491bfd02ae0d255e372df497e4257aff6
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce

Index: pkgsrc/databases/mariadb114-client/distinfo
diff -u pkgsrc/databases/mariadb114-client/distinfo:1.2 pkgsrc/databases/mariadb114-client/distinfo:1.3
--- pkgsrc/databases/mariadb114-client/distinfo:1.2     Wed Dec 11 10:32:04 2024
+++ pkgsrc/databases/mariadb114-client/distinfo Fri Dec 13 14:07:44 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2024/12/11 10:32:04 nia Exp $
+$NetBSD: distinfo,v 1.3 2024/12/13 14:07:44 nia Exp $
 
 BLAKE2s (mariadb-11.4.4.tar.gz) = fc52142819f7f0db26a0e7b21bf66938950c72705ffdca93d6720dc7235b2425
 SHA512 (mariadb-11.4.4.tar.gz) = dfa4c137d67c11c997bf67bceb27d072c51831f35e2ad438fe2f234cb530eb74e3283429aef620036db06943d7309dec36a4d015f578fd2a1f933637681841fb
@@ -7,6 +7,7 @@ SHA1 (patch-BUILD_compile-pentium32-gcov
 SHA1 (patch-CMakeLists.txt) = b41fc869c3ebf0b13138a566a03080a0f3475551
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
+SHA1 (patch-cmake_libfmt.cmake) = 5b33ee5491bfd02ae0d255e372df497e4257aff6
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce

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.3
--- /dev/null   Fri Dec 13 14:07:45 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake        Fri Dec 13 14:07:45 2024
@@ -0,0 +1,37 @@
+$NetBSD: patch-cmake_libfmt.cmake,v 1.3 2024/12/13 14:07:45 nia Exp $
+
+Disable broken libfmt detection.
+
+--- cmake/libfmt.cmake.orig    2024-12-13 13:59:17.741050173 +0000
++++ cmake/libfmt.cmake
+@@ -25,29 +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/args.h>
+-     int main() {
+-       using ArgStore= fmt::dynamic_format_arg_store<fmt::format_context>;
+-       ArgStore arg_store;
+-       int answer= 4321;
+-       arg_store.push_back(answer);
+-       return fmt::vformat(\"{:L}\", arg_store).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)

Index: pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake
diff -u /dev/null pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.3
--- /dev/null   Fri Dec 13 14:07:45 2024
+++ pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake Fri Dec 13 14:07:44 2024
@@ -0,0 +1,37 @@
+$NetBSD: patch-cmake_libfmt.cmake,v 1.3 2024/12/13 14:07:44 nia Exp $
+
+Disable broken libfmt detection.
+
+--- cmake/libfmt.cmake.orig    2024-12-13 13:59:17.741050173 +0000
++++ cmake/libfmt.cmake
+@@ -25,29 +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/args.h>
+-     int main() {
+-       using ArgStore= fmt::dynamic_format_arg_store<fmt::format_context>;
+-       ArgStore arg_store;
+-       int answer= 4321;
+-       arg_store.push_back(answer);
+-       return fmt::vformat(\"{:L}\", arg_store).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)