Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 8 insertions, 9 deletions

diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index e8ab0260b09..5b80a856e50 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -9,9 +9,10 @@ Import("use_vendored_libunwind")
 Import("wiredtiger")
 
 snappySuffix = '-1.1.7'
-zlibSuffix = '-1.2.13'
+zlibSuffix = '-1.2.11'
 pcreSuffix = "-8.42"
 icuSuffix = '-57.1'
+timelibSuffix = '-2021.06'
 tomcryptSuffix = '-1.18.2'
 variantSuffix = '-1.4.0'
 
@@ -22,9 +23,6 @@ thirdPartyEnvironmentModifications = {
    'fmt' : {
         'CPPPATH' : ['#src/third_party/fmt/dist/include'],
    },
-   'immer' : {
-        'CPPPATH': ['#src/third_party/immer/dist'],
-   },
    's2' : {
         'CPPPATH' : ['#src/third_party/s2'],
    },
@@ -34,7 +32,7 @@ thirdPartyEnvironmentModifications = {
         'CPPDEFINES' : [('SAFEINT_USE_INTRINSICS', 0)],
    },
    'timelib' : {
-        'CPPPATH' : ['#/src/third_party/timelib'],
+        'CPPPATH' : ['#/src/third_party/timelib' + timelibSuffix],
    },
    'unwind' : {
    },
@@ -566,10 +564,11 @@ yamlEnv.ShimLibrary(name="yaml")
 
 timelibEnv = env.Clone()
 timelibEnv.InjectThirdParty(libraries=['timelib'])
-timelibEnv.SConscript('timelib' + '/SConscript', exports={'env': timelibEnv})
-timelibEnv = timelibEnv.Clone(LIBDEPS_INTERFACE=[
-    'timelib' + '/timelib',
-])
+timelibEnv.SConscript('timelib' + timelibSuffix + '/SConscript', exports={ 'env' : timelibEnv })
+timelibEnv = timelibEnv.Clone(
+    LIBDEPS_INTERFACE=[
+        'timelib' + timelibSuffix + '/timelib',
+    ])
 
 timelibEnv.ShimLibrary(
     name='timelib',