From 237282cc2e6521ea5f673d0b9832f0e8a909f7b3 Mon Sep 17 00:00:00 2001
From: Martin <martin@urbackup.org>
Date: Mon, 9 Aug 2021 22:31:58 +0200
Subject: [PATCH] Fix build

---
 Makefile.am_client | 3 ++-
 Makefile.am_server | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.am_client b/Makefile.am_client
index 969ff9c8..8341ed6b 100644
--- a/Makefile.am_client
+++ b/Makefile.am_client
@@ -630,10 +630,11 @@ endif
 
 urbackupclientbackend_LDADD = $(PTHREAD_LIBS) $(DLOPEN_LIBS)
 urbackupclientbackend_CPPFLAGS = $(CRYPTOPP_CPPFLAGS) $(FORTIFY_FLAGS) $(SUID_CFLAGS) -Ibtrfs/fuse/nt -Ibtrfs/fuse/linnt
-urbackupclientbackend_CXXFLAGS = $(PTHREAD_CFLAGS) -DLINUX -DSTATIC_PLUGIN -DVARDIR='"$(localstatedir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DDATADIR='"$(datadir)"'
+urbackupclientbackend_CXXFLAGS = $(PTHREAD_CFLAGS) -DLINUX -DSTATIC_PLUGIN -DVARDIR='"$(localstatedir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DDATADIR='"$(datadir)"' -DNO_JEMALLOC
 if DISABLE_CERTAIN_WARNINGS
 urbackupclientbackend_CXXFLAGS += -Wno-subobject-linkage
 endif
+urbackupclientbackend_CXXFLAGS += -DNO_JEMALLOC
 if WITH_EMBEDDED_AWS_CPP_SDK
 urbackupclientbackend_CPPFLAGS += $(LIBCURL_CPPFLAGS) -Iexternal/aws-cpp-sdk/include -DHAVE_BUILTIN_CPU_SUPPORTS -DAWS_SDK_VERSION_MAJOR=1 -DAWS_SDK_VERSION_MINOR=8 -DAWS_SDK_VERSION_PATCH=186
 urbackupclientbackend_LDADD += $(LIBCURL)
diff --git a/Makefile.am_server b/Makefile.am_server
index b5de8a80..f16ffa1f 100644
--- a/Makefile.am_server
+++ b/Makefile.am_server
@@ -67,6 +67,10 @@ urbackupsrv_CPPFLAGS = $(CRYPTOPP_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(FUSE_CFLAGS) $
 if !WITH_ASSERTIONS
 urbackupsrv_CPPFLAGS+=-DNDEBUG
 endif
+if DISABLE_CERTAIN_WARNINGS
+urbackupsrv_CXXFLAGS += -Wno-subobject-linkage
+endif
+urbackupsrv_CXXFLAGS += -DNO_JEMALLOC
 if WITH_EMBEDDED_SQLITE3
 urbackupsrv_CFLAGS = -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_MAX_MMAP_SIZE=0x10000000000LL $(SUID_CFLAGS)
 else