From 9dd7d53af65ba7eabdfe1dd3f76c6e4bcb6a38aa Mon Sep 17 00:00:00 2001 From: andy5995 Date: Fri, 27 Sep 2024 05:08:06 -0500 Subject: [PATCH] Get tag 4.5 of plougher/squashfs-tools This prevents some of the multiple definition errors mentioned in #1084 when built on an Ubuntu greater than Focal, or with a gcc >= 10 --- cmake/dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 896e3a8d..bf468cff 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -53,7 +53,7 @@ if(NOT USE_SYSTEM_MKSQUASHFS) ExternalProject_Add(mksquashfs GIT_REPOSITORY https://github.com/plougher/squashfs-tools/ - GIT_TAG 4.4 + GIT_TAG 4.5 UPDATE_COMMAND "" # Make sure CMake won't try to fetch updates unnecessarily and hence rebuild the dependency every time CONFIGURE_COMMAND ${SED} -i "s|CFLAGS += -DXZ_SUPPORT|CFLAGS += ${mksquashfs_cflags}|g" /squashfs-tools/Makefile COMMAND ${SED} -i "s|LIBS += -llzma|LIBS += -Bstatic ${mksquashfs_ldflags}|g" /squashfs-tools/Makefile