nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 03:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

iproute_mptcp: fix build for -fno-common toolchains

Browse Source 
Without the change build on upstream gcc-10 fals as:

    ld: ipxfrm.o:(.bss+0x0): multiple definition of `filter'; ipmroute.o:(.bss+0x0): first defined here
    ld: xfrm_monitor.o:(.bss+0x0): multiple definition of `listen_all_nsid'; ipmonitor.o:(.bss+0x0): first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-21 11:10:20 +01:00 committed by Matthieu Coudron
parent 8a1f275216
commit d0c7af7c98
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/os-specific/linux/iproute/mptcp.nix
View File

@ -1,4 +1,4 @@
{ lib, iproute2, fetchFromGitHub }:
{ lib, iproute2, fetchFromGitHub, fetchpatch }:
iproute2.overrideAttrs (oa: rec {
pname = "iproute_mptcp";
@ -15,8 +15,19 @@ iproute2.overrideAttrs (oa: rec {
patchShebangs configure
'';
# We override "patches" to never apply any iproute2 patches:
patches = [ ];
patches = [
# We override "patches" to never apply any iproute2 patches:
] ++ [
# iproute-mptcp patches:
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/multipath-tcp/iproute-mptcp/pull/8
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/multipath-tcp/iproute-mptcp/commit/7aebfde8624c978f6f73b03142892f802d21cc0b.patch";
sha256 = "098402sjdm10r9xggz6naygnfjs74d9k3s2wc2aczx0d2zayhff8";
})
];
meta = with lib; {
homepage = "https://github.com/multipath-tcp/iproute-mptcp";