From ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sat, 21 Aug 2010 13:03:36 +0000 Subject: Patching the latest gnum4 so it builds with glibc 2.12.1 svn path=/nixpkgs/branches/stdenv-updates/; revision=23306 --- pkgs/development/tools/misc/gnum4/default.nix | 3 +++ pkgs/development/tools/misc/gnum4/s_isdir.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/misc/gnum4/s_isdir.patch (limited to 'pkgs/development/tools/misc/gnum4') diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 717a48f11e6d..d064c7578e06 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation { doCheck = !stdenv.isDarwin; + # Upstream is aware of it; it may be in the next release. + patches = [ ./s_isdir.patch ]; + meta = { homepage = http://www.gnu.org/software/m4/; description = "GNU M4, a macro processor"; diff --git a/pkgs/development/tools/misc/gnum4/s_isdir.patch b/pkgs/development/tools/misc/gnum4/s_isdir.patch new file mode 100644 index 000000000000..a009a4ba4465 --- /dev/null +++ b/pkgs/development/tools/misc/gnum4/s_isdir.patch @@ -0,0 +1,14 @@ +Fails to build with glibc 2.12.1 without this patch. + +http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html + +--- a/src/path.c ++++ b/src/path.c +@@ -22,6 +22,7 @@ + /* Handling of path search of included files via the builtins "include" + and "sinclude". */ + + #include "m4.h" ++#include "sys/stat.h" + + struct includes -- cgit 1.4.1