diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 13:03:36 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 13:03:36 +0000 |
commit | ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f (patch) | |
tree | 45e1228622a802df711933b2bc0962b4e62a69a9 | |
parent | 221317ae7b455aaf100e8b3bb02c213b0f6f0aaa (diff) | |
download | nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.tar nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.tar.gz nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.tar.bz2 nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.tar.lz nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.tar.xz nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.tar.zst nixlib-ff0b54e26e40b8bbbc7d1b415a770e8dcc82606f.zip |
Patching the latest gnum4 so it builds with glibc 2.12.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=23306
-rw-r--r-- | pkgs/development/tools/misc/gnum4/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gnum4/s_isdir.patch | 14 |
2 files changed, 17 insertions, 0 deletions
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 |