summary refs log tree commit diff
path: root/pkgs/development/tools/misc/elfutils/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-01-16 01:37:37 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-01-16 01:37:37 +0100
commit8f793ce6bb050252e92a987cc3c5bd48d5423a42 (patch)
tree1e2ea187f7b96c14da6d622fd1156c2d0ddfb2d0 /pkgs/development/tools/misc/elfutils/default.nix
parent5caa8ab55e21349871ae0b762d5f5cfa63c8a777 (diff)
downloadnixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.tar
nixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.tar.gz
nixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.tar.bz2
nixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.tar.lz
nixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.tar.xz
nixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.tar.zst
nixpkgs-8f793ce6bb050252e92a987cc3c5bd48d5423a42.zip
elfutils: Fix header compatibility with glibc 2.21
Regression introduced by df2b9b48cbf8eb765760c699843e43457d844bee.

This breaks the build for ltrace and other programs using libelf,
because the header file relies on features from glibc >= 2.22.

Here is an excerpt from the log output of the configure script from
ltrace:

In file included from ...elfutils-0.165/include/gelf.h:32:0,
                 from conftest.c:57:
...elfutils-0.165/include/libelf.h:280:8: error: unknown type name 'Elf32_Chdr'
 extern Elf32_Chdr *elf32_getchdr (Elf_Scn *__scn);
        ^
...elfutils-0.165/include/libelf.h:281:8: error: unknown type name 'Elf64_Chdr'
 extern Elf64_Chdr *elf64_getchdr (Elf_Scn *__scn);
        ^
In file included from conftest.c:57:0:
...elfutils-0.165/include/gelf.h:89:9: error: unknown type name 'Elf64_Chdr'
 typedef Elf64_Chdr GElf_Chdr;
         ^

The issue has been reported in the Debian bug tracker at
https://bugs.debian.org/810885 and I'm using the patch from Mark
Wielaard that has been posted there which adds compatibility for older
glibc versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/tools/misc/elfutils/default.nix')
-rw-r--r--pkgs/development/tools/misc/elfutils/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 1e073ea8c70..0a62859d207 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57";
   };
 
+  patches = [ ./glibc-2.21.patch ];
+
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
   # as the host-bzip2 will be in the path.
   nativeBuildInputs = [ m4 bison flex gettext bzip2 ];