CVS commit: pkgsrc/databases/mongodb

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Dec  7 16:46:11 UTC 2025

Modified Files:
        pkgsrc/databases/mongodb: distinfo
        pkgsrc/databases/mongodb/patches: patch-SConstruct

Log Message:
mongodb: Fix bogus configure check for mongoc-1.0

Unclear what changed (scons?) but it was passing "mongoc_get_major_version();"
to the command line arguments with each character being prefixed by -l.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/databases/mongodb/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mongodb/patches/patch-SConstruct

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

Modified files:

Index: pkgsrc/databases/mongodb/distinfo
diff -u pkgsrc/databases/mongodb/distinfo:1.41 pkgsrc/databases/mongodb/distinfo:1.42
--- pkgsrc/databases/mongodb/distinfo:1.41      Sat Aug 17 10:00:58 2024
+++ pkgsrc/databases/mongodb/distinfo   Sun Dec  7 16:46:10 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2024/08/17 10:00:58 tnn Exp $
+$NetBSD: distinfo,v 1.42 2025/12/07 16:46:10 maya Exp $
 
 BLAKE2s (mongodb-src-r6.0.13.tar.gz) = 84316d44874c482709a6352c3ee7c9752a498bf835b6d6038fc6925543358980
 SHA512 (mongodb-src-r6.0.13.tar.gz) = 8117e8bc4e2b298c36c83a6376b7e23a31606300fa34ca28f4c1624e3dbffe4a1bf7d869c4939e91690250c5bac361d899a2189d74e7afd5cf90ded94170ad33
 Size (mongodb-src-r6.0.13.tar.gz) = 89792150 bytes
-SHA1 (patch-SConstruct) = 247af4df0f9f13da774e58d0f22994b5e092f166
+SHA1 (patch-SConstruct) = 5a4e40e04e2aae2247c8afd37578dc4abf581fed
 SHA1 (patch-buildscripts_moduleconfig.py) = efa510420e97850a7c02aac3d0ddd54b4141d189
 SHA1 (patch-site__scons_mongo_platform.py) = 6a6daba04876f9779a26c579e6f6a66f55e1cbe6
 SHA1 (patch-site__scons_site__tools_libtool.py) = 72ec0ff7fa1c06d6d7d3881d7ed521c8c1285124

Index: pkgsrc/databases/mongodb/patches/patch-SConstruct
diff -u pkgsrc/databases/mongodb/patches/patch-SConstruct:1.11 pkgsrc/databases/mongodb/patches/patch-SConstruct:1.12
--- pkgsrc/databases/mongodb/patches/patch-SConstruct:1.11      Sat Jul 29 11:45:43 2023
+++ pkgsrc/databases/mongodb/patches/patch-SConstruct   Sun Dec  7 16:46:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConstruct,v 1.11 2023/07/29 11:45:43 adam Exp $
+$NetBSD: patch-SConstruct,v 1.12 2025/12/07 16:46:10 maya Exp $
 
 Add support for NetBSD and Dragonfly.
 Avoid -fatal-warnings: ld might complain about conflicting versions.
@@ -6,10 +6,12 @@ Fix locations.
 Don't compile with debug info.
 Don't mess with the linker.
 Respect LDFLAGS and CXXFLAGS.
+Fix bogus check for mongoc-1.0 library - we need call=somefunction();
+  otherwise it's part of the command line arguments to the compiler
 
---- SConstruct.orig    2023-06-29 13:37:52.000000000 +0000
+--- SConstruct.orig    2024-01-04 00:34:55.000000000 +0000
 +++ SConstruct
-@@ -1266,6 +1266,7 @@ envDict = dict(BUILD_ROOT=buildDir,
+@@ -1259,6 +1259,7 @@ envDict = dict(BUILD_ROOT=buildDir,
                 CONFIGURELOG='$BUILD_ROOT/scons/config.log',
                 CONFIG_HEADER_DEFINES={},
                 LIBDEPS_TAG_EXPANSIONS=[],
@@ -17,7 +19,7 @@ Respect LDFLAGS and CXXFLAGS.
                 )
  
  # By default, we will get the normal SCons tool search. But if the
-@@ -1455,7 +1456,9 @@ def CheckForProcessor(context, which_arc
+@@ -1448,7 +1449,9 @@ def CheckForProcessor(context, which_arc
  os_macros = {
      "windows": "defined(_WIN32)",
      "solaris": "defined(__sun)",
@@ -27,7 +29,7 @@ Respect LDFLAGS and CXXFLAGS.
      "openbsd": "defined(__OpenBSD__)",
      "iOS": "defined(__APPLE__) && TARGET_OS_IOS && !TARGET_OS_SIMULATOR",
      "iOS-sim": "defined(__APPLE__) && TARGET_OS_IOS && TARGET_OS_SIMULATOR",
-@@ -1591,7 +1594,7 @@ if env.TargetOSIs('posix'):
+@@ -1584,7 +1587,7 @@ if env.TargetOSIs('posix'):
          env.Append(
              CCFLAGS_WERROR=["-Werror"],
              CXXFLAGS_WERROR=['-Werror=unused-result'] if env.ToolchainIs('clang') else [],
@@ -36,7 +38,7 @@ Respect LDFLAGS and CXXFLAGS.
          )
  elif env.TargetOSIs('windows'):
          env.Append(
-@@ -2006,7 +2009,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_LIBS':
+@@ -1999,7 +2002,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_LIBS':
      if not env.TargetOSIs('solaris', 'darwin', 'windows', 'openbsd'):
          env.Tool('thin_archive')
  
@@ -45,7 +47,7 @@ Respect LDFLAGS and CXXFLAGS.
      env['LINK_WHOLE_ARCHIVE_LIB_START'] = '-Wl,--whole-archive'
      env['LINK_WHOLE_ARCHIVE_LIB_END'] = '-Wl,--no-whole-archive'
      env['LINK_AS_NEEDED_LIB_START'] = '-Wl,--as-needed'
-@@ -2183,14 +2186,14 @@ if env.TargetOSIs('linux'):
+@@ -2176,14 +2179,14 @@ if env.TargetOSIs('linux'):
  elif env.TargetOSIs('solaris'):
       env.Append( LIBS=["socket","resolv","lgrp"] )
  
@@ -62,7 +64,7 @@ Respect LDFLAGS and CXXFLAGS.
      env.Append( LIBS=[ "kvm" ] )
  
  elif env.TargetOSIs('windows'):
-@@ -2492,7 +2495,6 @@ if env.TargetOSIs('posix'):
+@@ -2485,7 +2488,6 @@ if env.TargetOSIs('posix'):
  
      # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
      env.Append( CCFLAGS=["-fasynchronous-unwind-tables",
@@ -70,7 +72,7 @@ Respect LDFLAGS and CXXFLAGS.
                           "-Wall",
                           "-Wsign-compare",
                           "-Wno-unknown-pragmas",
-@@ -3019,7 +3021,7 @@ def doConfigure(myenv):
+@@ -3010,7 +3012,7 @@ def doConfigure(myenv):
          myenv.AddMethod(
              functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
  
@@ -79,7 +81,7 @@ Respect LDFLAGS and CXXFLAGS.
          # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
          # because it is much faster. Don't use it if the user has already configured another linker
          # selection manually.
-@@ -3415,9 +3417,6 @@ def doConfigure(myenv):
+@@ -3406,9 +3408,6 @@ def doConfigure(myenv):
      if usingLibStdCxx:
          def CheckModernLibStdCxx(context):
              test_body = """
@@ -89,7 +91,7 @@ Respect LDFLAGS and CXXFLAGS.
              """
  
              context.Message('Checking for libstdc++ 5.3.0 or better... ')
-@@ -3828,7 +3827,7 @@ def doConfigure(myenv):
+@@ -3819,7 +3818,7 @@ def doConfigure(myenv):
          # Explicitly use the new gnu hash section if the linker offers
          # it, except on android since older runtimes seem to not
          # support it. For that platform, use 'both'.
@@ -98,7 +100,7 @@ Respect LDFLAGS and CXXFLAGS.
              myenv.AddToLINKFLAGSIfSupported('-Wl,--hash-style=both')
          else:
              myenv.AddToLINKFLAGSIfSupported('-Wl,--hash-style=gnu')
-@@ -4119,8 +4118,9 @@ def doConfigure(myenv):
+@@ -4110,8 +4109,9 @@ def doConfigure(myenv):
      def checkOpenSSL(conf):
          sslLibName = "ssl"
          cryptoLibName = "crypto"
@@ -110,7 +112,7 @@ Respect LDFLAGS and CXXFLAGS.
              sslLinkDependencies = ["crypto"]
  
          if conf.env.TargetOSIs('windows'):
-@@ -4457,7 +4457,7 @@ def doConfigure(myenv):
+@@ -4448,7 +4448,7 @@ def doConfigure(myenv):
          myenv.ConfError("Couldn't find SASL header/libraries")
  
      # requires ports devel/libexecinfo to be installed
@@ -119,3 +121,12 @@ Respect LDFLAGS and CXXFLAGS.
          if not conf.CheckLib("execinfo"):
              myenv.ConfError("Cannot find libexecinfo, please install devel/libexecinfo.")
  
+@@ -4586,7 +4586,7 @@ def doConfigure(myenv):
+                 ["mongoc-1.0"],
+                 ["mongoc/mongoc.h"],
+                 "C",
+-                "mongoc_get_major_version();",
++                call="mongoc_get_major_version();",
+                 autoadd=False ):
+             conf.env['MONGO_HAVE_LIBMONGOC'] = True
+         if not conf.env['MONGO_HAVE_LIBMONGOC'] and mongoc_mode == 'on':