Author: simons
Date: Thu Jan 27 13:35:53 2011
New Revision: 25701
URL: https://svn.nixos.org/websvn/nix/?rev=25701&sc=1
Log:
pkgs/development/libraries/glibc-2.5: fix build with GNU Make 3.82
Added:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix Thu Jan
27 13:34:06 2011 (r25700)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/default.nix Thu Jan
27 13:35:53 2011 (r25701)
@@ -12,7 +12,8 @@
md5 = "1fb29764a6a650a4d5b409dda227ac9f";
};
- patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch
./glibc-inline.patch ./x86-fnstsw.patch ./binutils-ld.patch ];
+ patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch
./glibc-inline.patch
+ ./x86-fnstsw.patch ./binutils-ld.patch ./make-3-82-fix.patch ];
inherit kernelHeaders installLocales;
Added: nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch
Thu Jan 27 13:35:53 2011 (r25701)
@@ -0,0 +1,14 @@
+--- glibc-2.5/manual/Makefile.orig 2011-01-26 17:03:14.000000000 +0100
++++ glibc-2.5/manual/Makefile 2011-01-26 17:04:30.000000000 +0100
+@@ -232,7 +232,10 @@
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
++$(objpfx)stubs ../po/manual.pot:
++ $(make-target-directory)
++ touch $@
++$(objpfx)stamp%:
+ $(make-target-directory)
+ touch $@
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
