summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <[email protected]>2024-04-18 01:56:31 +0000
committerroot <[email protected]>2024-04-18 01:56:31 +0000
commit54dfb9600b233349833c9d7aeb0d632b8fecd11a (patch)
tree2438f8317db4379f4dd00465c9dbf7725b06db5d
parent40ee1485b279d4d1176331bbd20aea151bef451a (diff)
remove dependency of jemalloc-devel
-rw-r--r--ci/travis.sh1
-rw-r--r--shaping/CMakeLists.txt2
-rw-r--r--vendor/CMakeLists.txt2
3 files changed, 2 insertions, 3 deletions
diff --git a/ci/travis.sh b/ci/travis.sh
index f9c76c9..695b014 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -48,7 +48,6 @@ yum install -y numactl-libs # required by mrzcpd
yum install -y libibverbs # required by mrzcpd
yum install -y libbreakpad_mini-devel
yum install -y msgpack-devel
-yum install -y jemalloc-devel
source /etc/profile.d/framework.sh
source /etc/profile.d/mrzcpd.sh
diff --git a/shaping/CMakeLists.txt b/shaping/CMakeLists.txt
index a8a0174..19862eb 100644
--- a/shaping/CMakeLists.txt
+++ b/shaping/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable(shaping_engine src/main.cpp)
target_link_libraries(shaping_engine PUBLIC shaper)
target_link_libraries(shaping_engine PUBLIC maatframe)
target_link_libraries(shaping_engine PUBLIC mrzcpd)
-target_link_libraries(shaping_engine PUBLIC libjemalloc-static unwind dl)
+target_link_libraries(shaping_engine PUBLIC libjemalloc-static dl)
target_link_libraries(shaping_engine PUBLIC swarmkv)
install(TARGETS shaping_engine RUNTIME DESTINATION bin COMPONENT Program)
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 363743a..c9f518d 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -39,7 +39,7 @@ set_property(TARGET cjson PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/
# jemalloc
ExternalProject_Add(libjemalloc PREFIX libjemalloc
URL ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc-5.3.0.tar.bz2
- CONFIGURE_COMMAND ./autogen.sh --prefix=<INSTALL_DIR> #--enable-prof --enable-prof-libunwind
+ CONFIGURE_COMMAND ./autogen.sh --prefix=<INSTALL_DIR> #--enable-prof
BUILD_COMMAND make
BUILD_IN_SOURCE 1
INSTALL_COMMAND make install prefix=<INSTALL_DIR>)