From 3c233ac911050f99387356af131e04a9be470252 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 3 Jun 2022 14:14:11 +0100 Subject: [PATCH] appimagekit.squashfuse: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here --- pkgs/tools/package-management/appimagekit/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 620a0b05a95c..3118b784334b 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -37,6 +37,11 @@ let cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] . ''; + # Workaround build failure on -fno-common toolchains: + # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): + # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h