fix

couchbasedeps · Feb 4, 2025 · d650dba · d650dba
1 parent 14bfc17
commit d650dba
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,6 +108,7 @@ include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
 include("${PROJECT_SOURCE_DIR}/cmake/system.cmake")
 
 if (USE_JEMALLOC)
+  add_definitions(-DUSE_JEMALLOC)
   set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
   find_package(Jemalloc REQUIRED)
 endif()

diff --git a/common.h b/common.h
@@ -82,8 +82,10 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 
 #if !defined(_MSC_VER)
 #include <unistd.h>

diff --git a/lapack-netlib/LAPACKE/include/lapack.h b/lapack-netlib/LAPACKE/include/lapack.h
@@ -11,8 +11,10 @@
 #include "lapacke_mangling.h"
 
 #include <stdlib.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 #include <stdarg.h>
 #include <inttypes.h>
 

diff --git a/lapack-netlib/SRC/ctrsyl3.c b/lapack-netlib/SRC/ctrsyl3.c
@@ -1,7 +1,9 @@
 #include <math.h>
 #include <stdlib.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <complex.h>

diff --git a/lapack-netlib/SRC/iparam2stage.c b/lapack-netlib/SRC/iparam2stage.c
@@ -1,7 +1,9 @@
 #include <math.h>
 #include <stdlib.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>

diff --git a/lapack-netlib/SRC/ztrsyl3.c b/lapack-netlib/SRC/ztrsyl3.c
@@ -2,8 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 #include <complex.h>
 #ifdef complex
 #undef complex

diff --git a/lapack-netlib/TESTING/MATGEN/clarnd.c b/lapack-netlib/TESTING/MATGEN/clarnd.c
@@ -1,7 +1,9 @@
 #include <math.h>
 #include <stdlib.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <complex.h>

diff --git a/lapack-netlib/TESTING/MATGEN/zlarnd.c b/lapack-netlib/TESTING/MATGEN/zlarnd.c
@@ -1,7 +1,9 @@
 #include <math.h>
 #include <stdlib.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif 
 #include <string.h>
 #include <stdio.h>
 #include <complex.h>

diff --git a/relapack/src/relapack.h b/relapack/src/relapack.h
@@ -45,8 +45,10 @@ typedef unsigned long BLASULONG;
 #include "lapack.h"
 #include "blas.h"
 
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 
 // sytrf helper routines
 void RELAPACK_ssytrf_rec2(const char *, const blasint *, const blasint *, blasint *, float *, const blasint *, blasint *, float *, const blasint *, blasint *);

diff --git a/relapack/test/test.h b/relapack/test/test.h
@@ -20,8 +20,10 @@
 #include "lapack.h"
 #include "util.h"
 #include <stdlib.h>
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/utest/ctest.h b/utest/ctest.h
@@ -299,8 +299,10 @@ void assert_dbl_far(double exp, double real, double tol, const char* caller, int
 
 #include <stdlib.h>
 
+#ifdef USE_JEMALLOC
 #define JEMALLOC_MANGLE
-#include <jemalloc/jemalloc.h> 
+#include <jemalloc/jemalloc.h>
+#endif
 
 #ifdef __CTEST_APPLE
 #include <dlfcn.h>