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

Require jemalloc

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2020-12-15 14:53:16 +01:00
parent d6b086ed03
commit 5368a1e2e3
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -25,6 +25,7 @@ addons:
- libboost-system-dev - libboost-system-dev
- libboost-thread-dev - libboost-thread-dev
- libevent-dev - libevent-dev
- libjemalloc-dev
- libdouble-conversion-dev - libdouble-conversion-dev
- libiberty-dev - libiberty-dev
- liblz4-dev - liblz4-dev

8
CMakeLists.txt
View File

@ -94,8 +94,10 @@ if(NOT FUSE_FOUND AND NOT FUSE3_FOUND)
message(FATAL_ERROR "No FUSE or FUSE3 library found") message(FATAL_ERROR "No FUSE or FUSE3 library found")
endif() endif()
find_path(SPARSEHASH_INCLUDE_DIR sparsehash/dense_hash_map REQUIRED) find_path(SPARSEHASH_INCLUDE_DIR sparsehash/dense_hash_map
find_program(RONN_EXE ronn) DOC "dense_hash_map header" REQUIRED)
find_program(RONN_EXE ronn DOC "ronn man page generator" REQUIRED)
find_library(JEMALLOC_LIBRARIES jemalloc DOC "jemalloc library" REQUIRED)
set(ZSTD_INCLUDE_DIR set(ZSTD_INCLUDE_DIR
"" ""
@ -205,6 +207,7 @@ 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)
@ -218,6 +221,7 @@ 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)

1
README.md
View File

@ -146,6 +146,7 @@ A good starting point for apt-based systems is probably:
libboost-system-dev \ libboost-system-dev \
libboost-thread-dev \ libboost-thread-dev \
libevent-dev \ libevent-dev \
libjemalloc-dev \
libdouble-conversion-dev \ libdouble-conversion-dev \
libiberty-dev \ libiberty-dev \
liblz4-dev \ liblz4-dev \

5
cmake/static_link.sh
View File

@ -5,10 +5,13 @@ 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" \
@ -36,12 +39,12 @@ g++ -static -static-libgcc -static-libstdc++ "$@" -o "$target" \
/usr/lib/x86_64-linux-gnu/libssl.a \ /usr/lib/x86_64-linux-gnu/libssl.a \
/usr/lib/x86_64-linux-gnu/libcrypto.a \ /usr/lib/x86_64-linux-gnu/libcrypto.a \
/usr/lib/x86_64-linux-gnu/libiberty.a \ /usr/lib/x86_64-linux-gnu/libiberty.a \
/usr/lib/x86_64-linux-gnu/libiberty.a \
/usr/lib/x86_64-linux-gnu/libunwind.a \ /usr/lib/x86_64-linux-gnu/libunwind.a \
/usr/lib/x86_64-linux-gnu/liblz4.a \ /usr/lib/x86_64-linux-gnu/liblz4.a \
/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/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 \