Author: simons Date: Tue Jan 4 13:12:01 2011 New Revision: 25383 URL: https://svn.nixos.org/websvn/nix/?rev=25383&sc=1
Log: 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. Added: nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/binutils-ld.patch Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix Added: nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/binutils-ld.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/binutils-ld.patch Tue Jan 4 13:12:01 2011 (r25383) @@ -0,0 +1,27 @@ +From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 +From: Ulrich Drepper <[email protected]> +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;/' \ + > [email protected] + $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ + $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ +-- +1.6.4 + Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix Tue Jan 4 13:11:57 2011 (r25382) +++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix Tue Jan 4 13:12:01 2011 (r25383) @@ -12,7 +12,7 @@ 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; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
