diff options
| author | Peter Simons <simons@cryp.to> | 2011-01-27 13:35:53 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-01-27 13:35:53 +0000 |
| commit | 031edc450906f0d8ba6d1ca817bc210133edb265 (patch) | |
| tree | 75bc9ef45b13a4dbbe431a9c55245007e59dca39 /pkgs/development/libraries/glibc-2.5 | |
| parent | e862574d517e1e8c14738b97df35b9f849c9bf6a (diff) | |
pkgs/development/libraries/glibc-2.5: fix build with GNU Make 3.82
svn path=/nixpkgs/trunk/; revision=25701
Diffstat (limited to 'pkgs/development/libraries/glibc-2.5')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.5/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc-2.5/default.nix b/pkgs/development/libraries/glibc-2.5/default.nix index b5ee705afd09a..8b8c204a4803d 100644 --- a/pkgs/development/libraries/glibc-2.5/default.nix +++ b/pkgs/development/libraries/glibc-2.5/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { 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; diff --git a/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch b/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch new file mode 100644 index 0000000000000..816e0aa528be3 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch @@ -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 $@ + |