TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-18 17:00:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable jemalloc for everything

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2020-12-15 17:43:33 +01:00
parent 37bba3111a
commit f7ae5b14d9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -207,7 +207,6 @@ if(FUSE3_FOUND)
FUSE_USE_VERSION=35) FUSE_USE_VERSION=35)
set_target_properties(dwarfs-bin PROPERTIES OUTPUT_NAME dwarfs) set_target_properties(dwarfs-bin PROPERTIES OUTPUT_NAME dwarfs)
target_link_libraries(dwarfs-bin PkgConfig::FUSE3) target_link_libraries(dwarfs-bin PkgConfig::FUSE3)
target_link_libraries(dwarfs-bin ${JEMALLOC_LIBRARIES})
add_custom_target(mount.dwarfs ALL COMMAND ${CMAKE_COMMAND} -E create_symlink add_custom_target(mount.dwarfs ALL COMMAND ${CMAKE_COMMAND} -E create_symlink
dwarfs mount.dwarfs) dwarfs mount.dwarfs)
install(TARGETS dwarfs-bin RUNTIME DESTINATION sbin) install(TARGETS dwarfs-bin RUNTIME DESTINATION sbin)
@ -221,7 +220,6 @@ if(FUSE_FOUND)
FUSE_USE_VERSION=29) FUSE_USE_VERSION=29)
set_target_properties(dwarfs2-bin PROPERTIES OUTPUT_NAME dwarfs2) set_target_properties(dwarfs2-bin PROPERTIES OUTPUT_NAME dwarfs2)
target_link_libraries(dwarfs2-bin PkgConfig::FUSE) target_link_libraries(dwarfs2-bin PkgConfig::FUSE)
target_link_libraries(dwarfs-bin ${JEMALLOC_LIBRARIES})
add_custom_target( add_custom_target(
mount.dwarfs2 ALL COMMAND ${CMAKE_COMMAND} -E create_symlink dwarfs2 mount.dwarfs2 ALL COMMAND ${CMAKE_COMMAND} -E create_symlink dwarfs2
mount.dwarfs2) mount.dwarfs2)
@ -398,6 +396,7 @@ target_link_libraries(
foreach(tgt ${BINARY_TARGETS}) foreach(tgt ${BINARY_TARGETS})
target_link_libraries(${tgt} dwarfs) target_link_libraries(${tgt} dwarfs)
target_link_libraries(${tgt} ${JEMALLOC_LIBRARIES})
if(TARGET folly_exception_tracer) if(TARGET folly_exception_tracer)
target_link_libraries( target_link_libraries(
${tgt} -Wl,--whole-archive folly_exception_tracer_base ${tgt} -Wl,--whole-archive folly_exception_tracer_base

5
cmake/static_link.sh
View File

@ -5,13 +5,10 @@ target=$1
shift shift
fuse="" fuse=""
malloc=""
if [[ "$target" == "dwarfs" ]]; then if [[ "$target" == "dwarfs" ]]; then
fuse="/usr/lib/x86_64-linux-gnu/libfuse3.a" fuse="/usr/lib/x86_64-linux-gnu/libfuse3.a"
malloc="/usr/lib/x86_64-linux-gnu/libjemalloc.a"
elif [[ "$target" == "dwarfs2" ]]; then elif [[ "$target" == "dwarfs2" ]]; then
fuse="/usr/lib/x86_64-linux-gnu/libfuse.a" fuse="/usr/lib/x86_64-linux-gnu/libfuse.a"
malloc="/usr/lib/x86_64-linux-gnu/libjemalloc.a"
fi fi
g++ -static -static-libgcc -static-libstdc++ "$@" -o "$target" \ g++ -static -static-libgcc -static-libstdc++ "$@" -o "$target" \
@ -44,7 +41,7 @@ g++ -static -static-libgcc -static-libstdc++ "$@" -o "$target" \
/usr/lib/x86_64-linux-gnu/liblzma.a \ /usr/lib/x86_64-linux-gnu/liblzma.a \
/usr/lib/x86_64-linux-gnu/libz.a \ /usr/lib/x86_64-linux-gnu/libz.a \
/usr/lib/gcc/x86_64-linux-gnu/10/libatomic.a \ /usr/lib/gcc/x86_64-linux-gnu/10/libatomic.a \
$malloc \ /usr/lib/x86_64-linux-gnu/libjemalloc.a \
/usr/lib/x86_64-linux-gnu/libpthread.a \ /usr/lib/x86_64-linux-gnu/libpthread.a \
/usr/lib/x86_64-linux-gnu/libdl.a \ /usr/lib/x86_64-linux-gnu/libdl.a \
/usr/lib/x86_64-linux-gnu/libc.a \ /usr/lib/x86_64-linux-gnu/libc.a \