gnu: xorg-server: Fix CVE-2017-{10971,10972}.
[jackhill/guix/guix.git] / gnu / packages / patches / ocaml-findlib-make-install.patch
CommitLineData
a747baba
JN
1Ocaml wants to install its "core" libraries in OCAML_CORE_STDLIB. That
2does not work in a store-based distribution.
3
4A solution was already provided by Nix
5
6 https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/ocaml/findlib/install_topfind.patch
7
8regenerated for Guix.
9
10--- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200
11+++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200
12@@ -89,7 +89,7 @@
13 install: all
14 mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
15 mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
16- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
17+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
18 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` && \
19 cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
20 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \