[pkgsrc/trunk]: pkgsrc/databases/mongodb mongodb: When building with the "ssl...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7444fb36c3d4
branches:  trunk
changeset: 771801:7444fb36c3d4
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Dec 27 09:36:10 2021 +0000

description:
mongodb: When building with the "ssl" option enabled, configuration
fails on NetBSD because it assumes that the "libdl" library is required
to link with libssl (for some reason). Limit libdl usage to Linux and
Solaris, since libdl isn't a thing on BSD-likes.

diffstat:

 databases/mongodb/distinfo                 |   4 +-
 databases/mongodb/patches/patch-SConstruct |  32 ++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

diffs (111 lines):

diff -r 1df54b8a701e -r 7444fb36c3d4 databases/mongodb/distinfo
--- a/databases/mongodb/distinfo        Mon Dec 27 09:13:25 2021 +0000
+++ b/databases/mongodb/distinfo        Mon Dec 27 09:36:10 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2021/10/26 10:09:24 nia Exp $
+$NetBSD: distinfo,v 1.35 2021/12/27 09:36:10 nia Exp $
 
 BLAKE2s (mongodb-src-r4.2.15.tar.gz) = 917d4e65f16a7ba228bf335965c2608f73645fe24e764e8f49f19ae052f47d48
 SHA512 (mongodb-src-r4.2.15.tar.gz) = ee46a2dfb7ae23ad38da49bf126a2bc7932bded8f01d34516ad575d2aed5d6233c5ad620b2a4424a98afb9e80e26acf40c66982cdd0637c13f0f7aaae8b746a0
 Size (mongodb-src-r4.2.15.tar.gz) = 62187847 bytes
-SHA1 (patch-SConstruct) = 027d8c9bd69256fe93ac40ae3e14e052ac367eb5
+SHA1 (patch-SConstruct) = 34749f069c6e6415f1b496e5c8ac2cc838c0ea5b
 SHA1 (patch-site__scons_mongo_platform.py) = 6a6daba04876f9779a26c579e6f6a66f55e1cbe6
 SHA1 (patch-site__scons_site__tools_libtool.py) = 2fb5947703f4292acc1306f92ca7938e8cbc62e0
 SHA1 (patch-src_mongo_base_initializer.h) = efaec2e3b5b8a4bfb15c65c6952924cd1469bdc7
diff -r 1df54b8a701e -r 7444fb36c3d4 databases/mongodb/patches/patch-SConstruct
--- a/databases/mongodb/patches/patch-SConstruct        Mon Dec 27 09:13:25 2021 +0000
+++ b/databases/mongodb/patches/patch-SConstruct        Mon Dec 27 09:36:10 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConstruct,v 1.9 2020/02/01 20:00:08 adam Exp $
+$NetBSD: patch-SConstruct,v 1.10 2021/12/27 09:36:10 nia Exp $
 
 Add support for NetBSD and Dragonfly.
 Fix locations.
@@ -6,9 +6,9 @@
 Don't mess with the linker.
 Respect LDFLAGS and CXXFLAGS.
 
---- SConstruct.orig    2019-12-04 23:29:59.000000000 +0000
+--- SConstruct.orig    2021-06-30 17:39:08.000000000 +0000
 +++ SConstruct
-@@ -1015,6 +1015,7 @@ envDict = dict(BUILD_ROOT=buildDir,
+@@ -1043,6 +1043,7 @@ envDict = dict(BUILD_ROOT=buildDir,
                 INSTALL_DIR=installDir,
                 CONFIG_HEADER_DEFINES={},
                 LIBDEPS_TAG_EXPANSIONS=[],
@@ -16,7 +16,7 @@
                 )
  
  env = Environment(variables=env_vars, **envDict)
-@@ -1169,7 +1170,9 @@ def CheckForProcessor(context, which_arc
+@@ -1193,7 +1194,9 @@ def CheckForProcessor(context, which_arc
  os_macros = {
      "windows": "defined(_WIN32)",
      "solaris": "defined(__sun)",
@@ -26,7 +26,7 @@
      "openbsd": "defined(__OpenBSD__)",
      "iOS": "defined(__APPLE__) && TARGET_OS_IOS && !TARGET_OS_SIMULATOR",
      "iOS-sim": "defined(__APPLE__) && TARGET_OS_IOS && TARGET_OS_SIMULATOR",
-@@ -1557,7 +1560,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_LIBS':
+@@ -1590,7 +1593,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_LIBS':
      if not env.TargetOSIs('solaris', 'darwin', 'windows', 'openbsd'):
          env.Tool('thin_archive')
  
@@ -35,7 +35,7 @@
      env['LINK_LIBGROUP_START'] = '-Wl,--start-group'
      env['LINK_LIBGROUP_END'] = '-Wl,--end-group'
      # NOTE: The leading and trailing spaces here are important. Do not remove them.
-@@ -1593,14 +1596,14 @@ if env.TargetOSIs('linux'):
+@@ -1626,14 +1629,14 @@ if env.TargetOSIs('linux'):
  elif env.TargetOSIs('solaris'):
       env.Append( LIBS=["socket","resolv","lgrp"] )
  
@@ -52,7 +52,7 @@
      env.Append( LIBS=[ "kvm" ] )
  
  elif env.TargetOSIs('windows'):
-@@ -1858,7 +1861,6 @@ if env.TargetOSIs('posix'):
+@@ -1891,7 +1894,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=["-fno-omit-frame-pointer",
                           "-fno-strict-aliasing",
@@ -60,7 +60,7 @@
                           "-pthread",
                           "-Wall",
                           "-Wsign-compare",
-@@ -2500,9 +2502,9 @@ def doConfigure(myenv):
+@@ -2533,9 +2535,9 @@ def doConfigure(myenv):
      if usingLibStdCxx:
          def CheckModernLibStdCxx(context):
              test_body = """
@@ -73,7 +73,7 @@
              """
  
              context.Message('Checking for libstdc++ 5.3.0 or better... ')
-@@ -2746,7 +2748,7 @@ def doConfigure(myenv):
+@@ -2779,7 +2781,7 @@ def doConfigure(myenv):
          #
          myenv.Append( CCFLAGS=["/Zc:inline"])
  
@@ -82,7 +82,19 @@
          # 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.
-@@ -3332,7 +3334,7 @@ def doConfigure(myenv):
+@@ -3021,8 +3023,9 @@ def doConfigure(myenv):
+     def checkOpenSSL(conf):
+         sslLibName = "ssl"
+         cryptoLibName = "crypto"
+-        sslLinkDependencies = ["crypto", "dl"]
+-        if conf.env.TargetOSIs('freebsd'):
++        if conf.env.TargetOSIs('linux', 'solaris'):
++            sslLinkDependencies = ["crypto", "dl"]
++        else:
+             sslLinkDependencies = ["crypto"]
+ 
+         if conf.env.TargetOSIs('windows'):
+@@ -3368,7 +3371,7 @@ def doConfigure(myenv):
          myenv.ConfError("Couldn't find SASL header/libraries")
  
      # requires ports devel/libexecinfo to be installed