From 7d92eea1c93cf64f11adf4329215f3f5f27e06de Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 May 2022 08:24:43 +0100 Subject: [PATCH] svnfs: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here --- pkgs/tools/filesystems/svnfs/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index a192032aa938..0512a8407dfb 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=${subversion.out}/lib ''; - NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1"; + # -fcommon: workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of + # `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here + NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1 -fcommon"; NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1"; meta = {