Skip to content

Commit a506ff8

Browse files
committed
ref: use zstd instead of gsip as compression algorithm for squashfuse
1 parent 4acd7cf commit a506ff8

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

cmake/dependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if(NOT USE_SYSTEM_SQUASHFUSE)
2121
GIT_TAG master
2222
UPDATE_COMMAND "" # make sure CMake won't try to fetch updates unnecessarily and hence rebuild the dependency every time
2323
CONFIGURE_COMMAND sh autogen.sh
24-
COMMAND sh <SOURCE_DIR>/configure --host=${HOST} --disable-demo --disable-high-level --prefix=<INSTALL_DIR> --libdir=<INSTALL_DIR>/lib
24+
COMMAND sh <SOURCE_DIR>/configure --host=${HOST} --disable-demo --disable-high-level --enable-shared=no --enable-static=yes --without-zlib --without-xz --prefix=<INSTALL_DIR> --libdir=<INSTALL_DIR>/lib
2525
BUILD_COMMAND ${MAKE}
2626
BUILD_IN_SOURCE ON
2727
INSTALL_COMMAND ${MAKE} install

src/runtime/CMakeLists.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import_pkgconfig_target(TARGET_NAME fuse2 PKGCONFIG_TARGET fuse)
2-
import_pkgconfig_target(TARGET_NAME zlib PKGCONFIG_TARGET zlib)
3-
import_pkgconfig_target(TARGET_NAME liblzma PKGCONFIG_TARGET liblzma)
4-
import_pkgconfig_target(TARGET_NAME libzstd PKGCONFIG_TARGET libzstd)
1+
find_package(Threads REQUIRED)
2+
3+
include(FindPkgConfig)
4+
pkg_check_modules(ZSTD REQUIRED IMPORTED_TARGET libzstd)
5+
pkg_check_modules(FUSE REQUIRED IMPORTED_TARGET fuse)
6+
57

68
add_executable(
79
runtime
@@ -15,11 +17,10 @@ add_executable(
1517

1618
target_link_libraries(
1719
runtime
18-
PRIVATE bson_static appimage_type3_header
19-
libsquashfuse fuse2 zlib liblzma libzstd pthread dl
20+
PRIVATE appimage_type3_header libsquashfuse bson_static Threads::Threads PkgConfig::ZSTD PkgConfig::FUSE
2021
)
2122

2223
target_compile_definitions(runtime PRIVATE _FILE_OFFSET_BITS=64)
2324

2425
# add magic bytes section to the final executable
25-
target_link_options(runtime PRIVATE -T ${CMAKE_CURRENT_SOURCE_DIR}/magic_bytes.ld)
26+
target_link_options(runtime PRIVATE -T ${CMAKE_CURRENT_SOURCE_DIR}/magic_bytes.ld)

0 commit comments

Comments
 (0)