guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/07: gnu: Remove unused patch 'ocaml-findlib-make-install.patch'.


From: guix-commits
Subject: 05/07: gnu: Remove unused patch 'ocaml-findlib-make-install.patch'.
Date: Mon, 4 Feb 2019 18:20:17 -0500 (EST)

lfam pushed a commit to branch master
in repository guix.

commit 5cc3dbbccdcf96308681fd076e1c773486f5dae0
Author: Leo Famulari <address@hidden>
Date:   Tue Feb 5 00:12:10 2019 +0100

    gnu: Remove unused patch 'ocaml-findlib-make-install.patch'.
    
    This is a followup to commit bff6739d5ea513417bb491a61aa276c4fb7ddd43.
    
    * gnu/packages/patches/ocaml-findlib-make-install.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                         |  1 -
 .../patches/ocaml-findlib-make-install.patch         | 20 --------------------
 2 files changed, 21 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 4ce08a6..284cd03 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1081,7 +1081,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/ocaml-CVE-2015-8869.patch               \
   %D%/packages/patches/ocaml-Add-a-.file-directive.patch       \
   %D%/packages/patches/ocaml-enable-ocamldoc-reproducibility.patch     \
-  %D%/packages/patches/ocaml-findlib-make-install.patch        \
   %D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch       \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/ola-readdir-r.patch                     \
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 238f9ca..0000000
--- 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)"; }; \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]