File squashfuse_from_appimage.patch of Package squashfuse

Overview Repositories Revisions Requests Users Attributes Meta

File squashfuse_from_appimage.patch of Package squashfuse (Revision 54aa583a1702d0fcc129c6f116f15dfa)

Currently displaying revision 54aa583a1702d0fcc129c6f116f15dfa , Show latest

diff --git a/Makefile.am b/Makefile.am
index fd367af..de2e077 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = gen_swap.sh autogen.sh LICENSE CONFIGURATION PLATFORMS NEWS win
 
 bin_PROGRAMS =
 noinst_PROGRAMS =
-lib_LTLIBRARIES = 
+lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 pkgincludedir = @includedir@/squashfuse
@@ -32,7 +32,7 @@ libsquashfuse_convenience_la_SOURCES = swap.c cache.c table.c dir.c file.c fs.c
 	dir.h file.h decompress.h xattr.h squashfuse.h hash.h stack.h traverse.h \
 	util.h fs.h
 libsquashfuse_convenience_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
 libsquashfuse_convenience_la_LIBADD = $(COMPRESSION_LIBS) $(FUSE_LIBS)
 
 # Main library: libsquashfuse
@@ -46,9 +46,9 @@ if SQ_WANT_FUSE
 # Helper for FUSE clients: libfuseprivate
 libfuseprivate_la_SOURCES = fuseprivate.c nonstd-makedev.c nonstd-enoattr.c \
 	fuseprivate.h stat.h stat.c
-libfuseprivate_la_CPPFLAGS = $(FUSE_CPPFLAGS)
+libfuseprivate_la_CPPFLAGS = $(FUSE_CPPFLAGS) -ffat-lto-objects
 libfuseprivate_la_LIBADD = $(COMPRESSION_LIBS) $(FUSE_LIBS)
-noinst_LTLIBRARIES += libfuseprivate.la
+lib_LTLIBRARIES += libfuseprivate.la
 endif
 
 # High-level squashfuse
@@ -56,7 +56,7 @@ if SQ_WANT_HIGHLEVEL
 bin_PROGRAMS += squashfuse
 squashfuse_SOURCES = hl.c
 squashfuse_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
 squashfuse_LDADD = libsquashfuse_convenience.la libfuseprivate.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
 dist_man_MANS += squashfuse.1
 endif
@@ -68,24 +68,24 @@ if SQ_WANT_LOWLEVEL
 noinst_LTLIBRARIES += libsquashfuse_ll_convenience.la
 libsquashfuse_ll_convenience_la_SOURCES = ll.c ll_inode.c nonstd-daemon.c
 libsquashfuse_ll_convenience_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
 libsquashfuse_ll_convenience_la_LIBADD = libsquashfuse_convenience.la libfuseprivate.la
 
 # squashfuse_ll library we will install
 lib_LTLIBRARIES += libsquashfuse_ll.la
-libsquashfuse_ll_la_SOURCES =
+libsquashfuse_ll_la_SOURCES = ll_main.c
 libsquashfuse_ll_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
 libsquashfuse_ll_la_LIBADD = libsquashfuse_ll_convenience.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
 
 # squashfuse_ll binary that's statically linked against internal libs
-bin_PROGRAMS += squashfuse_ll
-squashfuse_ll_SOURCES = ll_main.c
-squashfuse_ll_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
-squashfuse_ll_LDADD = libsquashfuse_ll_convenience.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
+# bin_PROGRAMS += squashfuse_ll
+# squashfuse_ll_SOURCES = ll_main.c
+# squashfuse_ll_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
+# 	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
+# squashfuse_ll_LDADD = libsquashfuse_ll_convenience.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
 
-dist_man_MANS += squashfuse_ll.1
+# dist_man_MANS += squashfuse_ll.1
 pkgconfig_DATA += squashfuse_ll.pc
 pkginclude_HEADERS += ll.h
 endif
diff --git a/ll_main.c b/ll_main.c
index c3659f5..32a80dc 100644
--- a/ll_main.c
+++ b/ll_main.c
@@ -121,7 +121,7 @@ static void set_sigterm_handler(const char *mountpoint) {
 }
 #endif /* SQFS_SIGTERM_HANDLER */
 
-int main(int argc, char *argv[]) {
+int fusefs_main(int argc, char *argv[]) {
 	struct fuse_args args;
 	sqfs_opts opts;

Places

File squashfuse_from_appimage.patch of Package squashfuse (Revision 54aa583a1702d0fcc129c6f116f15dfa)

Places