Merge branch 'master' into spell_warr_thunder_blast

Author: Shauren

dep/CMakeLists.txt

@@ -20,7 +20,9 @@ if(SERVERS OR TOOLS)
   add_subdirectory(utf8cpp)
   add_subdirectory(valgrind)
   add_subdirectory(openssl)
-  add_subdirectory(jemalloc)
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM)
+    add_subdirectory(jemalloc)
+  endif()
   add_subdirectory(argon2)
   add_subdirectory(openssl_ed25519)
   add_subdirectory(short_alloc)

dep/PackageList.txt

@@ -17,8 +17,8 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
   Version: 9.0-Release r4036
 
 jemalloc (a general-purpose scalable concurrent malloc-implementation)
-  http://www.canonware.com/jemalloc/
-  Version: 5.2.1
+  https://github.com/jemalloc/jemalloc
+  Version: 5.3.0
 
 libreadline (command line editing library)
   https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html