diff options
| author | Ricardo Wurmus <[email protected]> | 2019-02-06 13:03:26 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <[email protected]> | 2019-02-06 13:03:26 +0100 |
| commit | ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d (patch) | |
| tree | 75c68e44d3d76440f416552711b1a47ec83e411e /gnu/packages/patches/ocaml-findlib-make-install.patch | |
| parent | f380f9d55e6757c242acf6c71c4a3ccfcdb066b2 (diff) | |
| parent | 4aeb7f34c948f32363f2ae29c6942c6328df758c (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/ocaml-findlib-make-install.patch')
| -rw-r--r-- | gnu/packages/patches/ocaml-findlib-make-install.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/gnu/packages/patches/ocaml-findlib-make-install.patch b/gnu/packages/patches/ocaml-findlib-make-install.patch deleted file mode 100644 index 238f9ca3ce..0000000000 --- a/gnu/packages/patches/ocaml-findlib-make-install.patch +++ /dev/null @@ -1,20 +0,0 @@ -Ocaml wants to install its "core" libraries in OCAML_CORE_STDLIB. That -does not work in a store-based distribution. - -A solution was already provided by Nix - - https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/ocaml/findlib/install_topfind.patch - -regenerated for Guix. - ---- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200 -+++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200 -@@ -89,7 +89,7 @@ - install: all - mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" - mkdir -p "$(prefix)$(OCAMLFIND_BIN)" -- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" -+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" - f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ |