Post-merge build fixes

- Don't add DZSTD_STATIC_LINKING_ONLY
- Don't use upstream's way of linking with Jemalloc (MyRocks/MariaDB has
  its own in build_rocksdb.cmake)
- Don't depend on libunwind

2 files changed, 23 insertions, 18 deletions

diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index 3bc58ad57c6..fa564a603e6 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -162,23 +162,25 @@ if (UNIX AND NOT APPLE)
   TARGET_LINK_LIBRARIES(rocksdb_aux_lib -lrt)
 endif()
 
-IF (WITH_JEMALLOC)
-  FIND_LIBRARY(JEMALLOC_LIBRARY
-    NAMES libjemalloc${PIC_EXT}.a jemalloc
-    HINTS ${WITH_JEMALLOC}/lib)
-  SET(rocksdb_static_libs ${rocksdb_static_libs}
-    ${JEMALLOC_LIBRARY})
-  ADD_DEFINITIONS(-DROCKSDB_JEMALLOC)
-  ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE)
-ENDIF()
-
-IF (WITH_UNWIND)
-  FIND_LIBRARY(UNWIND_LIBRARY
-    NAMES libunwind${PIC_EXT}.a unwind
-    HINTS ${WITH_UNWIND}/lib)
-  SET(rocksdb_static_libs ${rocksdb_static_libs}
-    ${UNWIND_LIBRARY})
-ENDIF()
+# IF (WITH_JEMALLOC)
+#  FIND_LIBRARY(JEMALLOC_LIBRARY
+#    NAMES libjemalloc${PIC_EXT}.a jemalloc
+#    HINTS ${WITH_JEMALLOC}/lib)
+#  SET(rocksdb_static_libs ${rocksdb_static_libs}
+#    ${JEMALLOC_LIBRARY})
+#  ADD_DEFINITIONS(-DROCKSDB_JEMALLOC)
+#  ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE)
+# ENDIF()
+
+# MariaDB: Q: why does the upstream add libunwind for a particular 
+# storage engine?
+#IF (WITH_UNWIND)
+#  FIND_LIBRARY(UNWIND_LIBRARY
+#    NAMES libunwind${PIC_EXT}.a unwind
+#    HINTS ${WITH_UNWIND}/lib)
+#  SET(rocksdb_static_libs ${rocksdb_static_libs}
+#    ${UNWIND_LIBRARY})
+#ENDIF()
 
 
 TARGET_LINK_LIBRARIES(rocksdb rocksdb_aux_lib)
@@ -209,7 +211,8 @@ ENDIF()
 CHECK_FUNCTION_EXISTS(sched_getcpu  HAVE_SCHED_GETCPU)
 IF(HAVE_SCHED_GETCPU)
   ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1)
-  ADD_DEFINITIONS(-DZSTD_STATIC_LINKING_ONLY)
+# MariaDB: don't do this:
+#  ADD_DEFINITIONS(-DZSTD_STATIC_LINKING_ONLY)
 ENDIF()
 
 IF (WITH_TBB)
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index 734911c65fb..49d249c0eb3 100644
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
@@ -21,11 +21,13 @@ else()
   if(WITH_ROCKSDB_JEMALLOC)
     find_package(JeMalloc REQUIRED)
     add_definitions(-DROCKSDB_JEMALLOC)
+    ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE)
     include_directories(${JEMALLOC_INCLUDE_DIR})
   endif()
   if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     # FreeBSD has jemaloc as default malloc
     add_definitions(-DROCKSDB_JEMALLOC)
+    ADD_DEFINITIONS(-DROCKSDB_MALLOC_USABLE_SIZE)
     set(WITH_JEMALLOC ON)
   endif()
 endif()