diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
| commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
| tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch | |
| parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
| parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
| download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip | |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch b/nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch new file mode 100644 index 000000000000..d153fb67d419 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ocaml/ocamlbuild.patch @@ -0,0 +1,45 @@ +Author: Vincent Laporte <Vincent.Laporte@gmail.com> +Date: Sun Feb 1 11:19:50 2015 +0100 + + ocamlbuild: use ocamlfind to discover camlp4 path + + and default to `+camlp4` + +diff --git a/ocamlbuild/ocaml_specific.ml b/ocamlbuild/ocaml_specific.ml +index b902810..a73b7a5 100644 +--- a/ocamlbuild/ocaml_specific.ml ++++ b/ocamlbuild/ocaml_specific.ml +@@ -698,15 +698,25 @@ ocaml_lib ~extern:true ~tag_name:"use_toplevel" "toplevellib";; + ocaml_lib ~extern:true ~dir:"+ocamldoc" "ocamldoc";; + ocaml_lib ~extern:true ~dir:"+ocamlbuild" ~tag_name:"use_ocamlbuild" "ocamlbuildlib";; + +-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_camlp4" "camlp4lib";; +-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_old_camlp4" "camlp4";; +-ocaml_lib ~extern:true ~dir:"+camlp4" ~tag_name:"use_camlp4_full" "camlp4fulllib";; ++let camlp4dir = ++ Findlib.( ++ try ++ if sys_command "sh -c 'ocamlfind list >/dev/null' 2>/dev/null" != 0 ++ then raise (Findlib_error Cannot_run_ocamlfind); ++ (query "camlp4").location ++ with Findlib_error _ -> ++ "+camlp4" ++ );; ++ ++ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_camlp4" "camlp4lib";; ++ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_old_camlp4" "camlp4";; ++ocaml_lib ~extern:true ~dir:camlp4dir ~tag_name:"use_camlp4_full" "camlp4fulllib";; + flag ["ocaml"; "compile"; "use_camlp4_full"] +- (S[A"-I"; A"+camlp4/Camlp4Parsers"; +- A"-I"; A"+camlp4/Camlp4Printers"; +- A"-I"; A"+camlp4/Camlp4Filters"]);; +-flag ["ocaml"; "use_camlp4_bin"; "link"; "byte"] (A"+camlp4/Camlp4Bin.cmo");; +-flag ["ocaml"; "use_camlp4_bin"; "link"; "native"] (A"+camlp4/Camlp4Bin.cmx");; ++ (S[A"-I"; A(camlp4dir^"/Camlp4Parsers"); ++ A"-I"; A(camlp4dir^"/Camlp4Printers"); ++ A"-I"; A(camlp4dir^"/Camlp4Filters")]);; ++flag ["ocaml"; "use_camlp4_bin"; "link"; "byte"] (A(camlp4dir^"/Camlp4Bin.cmo"));; ++flag ["ocaml"; "use_camlp4_bin"; "link"; "native"] (A(camlp4dir^"/Camlp4Bin.cmx"));; + + flag ["ocaml"; "debug"; "compile"; "byte"] (A "-g");; + flag ["ocaml"; "debug"; "link"; "byte"; "program"] (A "-g");; |