From 781012ed274ca4cb5996b699f84fcf6683c6da3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Jan 2011 13:12:01 +0000 Subject: [PATCH] pkgs/development/libraries/glibc-2.5/binutils-ld.patch: migrate patch from glibc 2.9 Adjust the sed script to insert _begin in to newer linker scripts. svn path=/nixpkgs/trunk/; revision=25383 --- .../libraries/glibc-2.5/binutils-ld.patch | 27 +++++++++++++++++++ .../libraries/glibc-2.5/default.nix | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/glibc-2.5/binutils-ld.patch diff --git a/pkgs/development/libraries/glibc-2.5/binutils-ld.patch b/pkgs/development/libraries/glibc-2.5/binutils-ld.patch new file mode 100644 index 000000000000..4cd7ab3cec34 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.5/binutils-ld.patch @@ -0,0 +1,27 @@ +From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 +From: Ulrich Drepper +Date: Sat, 31 Jan 2009 00:21:15 +0000 +Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to + + newer linker scripts. +--- + ChangeLog | 5 +++++ + elf/Makefile | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/elf/Makefile b/elf/Makefile +index 8079fe9..e44ff1d 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) + $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ + LC_ALL=C \ + sed -e '/^=========/,/^=========/!d;/^=========/d' \ +- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ ++ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ + > $@.lds + $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ + $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ +-- +1.6.4 + diff --git a/pkgs/development/libraries/glibc-2.5/default.nix b/pkgs/development/libraries/glibc-2.5/default.nix index 83447d8fe8a9..b5ee705afd09 100644 --- a/pkgs/development/libraries/glibc-2.5/default.nix +++ b/pkgs/development/libraries/glibc-2.5/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { md5 = "1fb29764a6a650a4d5b409dda227ac9f"; }; - patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ./glibc-inline.patch ./x86-fnstsw.patch ]; + patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ./glibc-inline.patch ./x86-fnstsw.patch ./binutils-ld.patch ]; inherit kernelHeaders installLocales;