JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strongswan: fix build against -fno-common toolchain

Browse Source 
Example toolchain is clang-12:

    $ nix-build -E 'with import ./. {}; strongswan.override { stdenv = clang12Stdenv; }'
    ...
    ld: commands/load_authorities.o:/build/source/src/swanctl/./swanctl.h:33:
      multiple definition of `swanctl_dir';
        commands/load_all.o:/build/source/src/swanctl/./swanctl.h:33: first defined here

Pull upstream fix.
This commit is contained in:
Sergei Trofimovich 2021-10-11 09:46:38 +01:00
parent fa06e34c5e
commit dc5810ada6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/networking/strongswan/default.nix
View File

@ -46,6 +46,13 @@ stdenv.mkDerivation rec {
url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch";
sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c";
})
# fix build with -fno-common tollchain
(fetchpatch {
name = "fno-common.patch";
url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24";
sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f";
})
];
postPatch = optionalString stdenv.isLinux ''