From b12c35dcf6a26359f552e7f2085e1c761b16e4b8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 May 2022 18:33:18 +0100 Subject: [PATCH] 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 --- pkgs/tools/filesystems/orangefs/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index f6a35437fb92..0b4ec481fc71 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -1,4 +1,4 @@ -{ 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 ];