elfutils: Fix header compatibility with glibc 2.21

Regression introduced by df2b9b48cb.

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>

This commit is contained in:

aszlig

2016-01-16 01:37:37 +01:00

parent 5caa8ab55e

commit 8f793ce6bb

2 changed files with 166 additions and 0 deletions

									
										pkgs/development/tools/misc/elfutils/default.nix
									
		+2
		
												View File
												
				@@ -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 ];