diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-18 18:56:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-18 18:56:03 +0000 |
| commit | e9fd810997aadfcc857a19b792c26a2c82cb6ac2 (patch) | |
| tree | 83c719d3e972fe702b2ae66ad9bb93aac0284120 | |
| parent | ab8a599e8c1b75049befdaf52bdc3371b5900542 (diff) | |
| download | nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.tar nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.tar.gz nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.tar.bz2 nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.tar.lz nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.tar.xz nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.tar.zst nixlib-e9fd810997aadfcc857a19b792c26a2c82cb6ac2.zip | |
antlr-2: compile library
svn path=/nixpkgs/trunk/; revision=23235
| -rw-r--r-- | pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch | 26 | ||||
| -rw-r--r-- | pkgs/development/tools/parsing/antlr/2.7.7.nix | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch b/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch new file mode 100644 index 000000000000..a71b7718e3bf --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch @@ -0,0 +1,26 @@ +diff --git a/lib/cpp/antlr/CharScanner.hpp b/lib/cpp/antlr/CharScanner.hpp +index 8a97e97..1835a3e 100644 +--- a/lib/cpp/antlr/CharScanner.hpp ++++ b/lib/cpp/antlr/CharScanner.hpp +@@ -11,6 +11,8 @@ + #include <antlr/config.hpp> + + #include <map> ++#include <cstdio> ++#include <cstring> + + #ifdef HAS_NOT_CCTYPE_H + #include <ctype.h> +diff --git a/scripts/config.make.in b/scripts/config.make.in +index c23dd5c..6057309 100644 +--- a/scripts/config.make.in ++++ b/scripts/config.make.in +@@ -38,7 +38,7 @@ MAKEOVERRIDES := $(patsubst SUBDIRS=%,,$(MAKEOVERRIDES)) + all clean distclean test install force-target clean-target :: + @dirs="$(SUBDIRS)" ; \ + test -z "$${dirs}" && { \ +- dirs=`/bin/ls` ; \ ++ dirs=`ls` ; \ + } ; \ + for d in . $${dirs} ; do \ + case $${d} in \ diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index f1caa951f66c..8d68479dd0e6 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -6,5 +6,6 @@ stdenv.mkDerivation { url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz"; sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5"; }; + patches = [ ./2.7.7-fixes.patch ]; buildInputs = [jdk python]; } |