Commit b12c35dc authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

orangefs: pull upstream fix for -fno-common toolchains 

Without the change upstream gcc-10 fails to build as:

    ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of
      `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here
parent e04ca593

pkgs/tools/filesystems/orangefs/default.nix

+10 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, bison, flex, autoreconfHook

{ lib, stdenv, fetchurl, fetchpatch, bison, flex, autoreconfHook

, openssl, db, attr, perl, tcsh

} :
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec { 
    sha256 = "0c2yla615j04ygclfavh8g5miqhbml2r0zs2c5mvkacf9in7p7sq";

  };



  patches = [

    # Pull upstream fix for -fno-common toolchains

    (fetchpatch {

      name = "fno-common.patch";

      url = "https://github.com/waltligon/orangefs/commit/f472beb50356bea657d1c32f1ca8a73e4718fd57.patch";

      sha256 = "0jaq1ffdxgymjciddsy8h8r87nwbif4v5yv4wd7jxysn25a0hdai";

    })

  ];



  nativeBuildInputs = [ bison flex perl autoreconfHook ];

  buildInputs = [ openssl db attr tcsh ];