File squashfuse_from_appimage.patch of Package squashfuse

Overview Repositories Revisions Requests Users Attributes Meta

File squashfuse_from_appimage.patch of Package squashfuse (Revision 9280083453ab7bf091e7a4d489c9677f)

Currently displaying revision 9280083453ab7bf091e7a4d489c9677f , Show latest

Index: squashfuse-0.1.105/Makefile.am
===================================================================
--- squashfuse-0.1.105.orig/Makefile.am
+++ squashfuse-0.1.105/Makefile.am
@@ -38,16 +38,16 @@ libsquashfuse_convenience_la_LIBADD = $(
 lib_LTLIBRARIES += libsquashfuse.la
 libsquashfuse_la_SOURCES =
 libsquashfuse_la_CPPFLAGS = $(ZLIB_CPPFLAGS) $(XZ_CPPFLAGS) $(LZO_CPPFLAGS) \
-	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS)
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
 libsquashfuse_la_LIBADD = libsquashfuse_convenience.la
 
 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
@@ -55,7 +55,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
@@ -67,21 +67,21 @@ 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_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)
+	$(LZ4_CPPFLAGS) $(ZSTD_CPPFLAGS) $(FUSE_CPPFLAGS) -ffat-lto-objects
 squashfuse_ll_LDADD = libsquashfuse_ll_convenience.la $(COMPRESSION_LIBS) $(FUSE_LIBS)
 
 pkgconfig_DATA += squashfuse_ll.pc
Index: squashfuse-0.1.105/ll_main.c
===================================================================
--- squashfuse-0.1.105.orig/ll_main.c
+++ squashfuse-0.1.105/ll_main.c
@@ -37,7 +37,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-int main(int argc, char *argv[]) {
+int fusefs_main(int argc, char *argv[], void (*mounted) (void)) {
 	struct fuse_args args;
 	sqfs_opts opts;
 
@@ -141,7 +141,8 @@ int main(int argc, char *argv[]) {
 				if (fuse_set_signal_handlers(ch.session) != -1) {
 					if (opts.idle_timeout_secs) {
 						setup_idle_timeout(ch.session, opts.idle_timeout_secs);
-					}
+					if (mounted)
+						mounted ();
 					/* FIXME: multithreading */
 					err = fuse_session_loop(ch.session);
 					teardown_idle_timeout();
@@ -153,6 +154,8 @@ int main(int argc, char *argv[]) {
 		}
 	}
 	fuse_opt_free_args(&args);
+	if (mounted)
+		rmdir (fuse_cmdline_opts.mountpoint);
 	free(ll);
 	free(fuse_cmdline_opts.mountpoint);

Places

File squashfuse_from_appimage.patch of Package squashfuse (Revision 9280083453ab7bf091e7a4d489c9677f)

Places