mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
ec9d932562
* gnu/packages/ocaml.scm (ocaml-dose3): New variable. * gnu/packages/patches/ocaml-dose3-Add-unix-as-dependency-to-dose3.common-in-META.in.patch: New file. * gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch: New file. * gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch: New file. * gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them.
133 lines
3.9 KiB
Diff
133 lines
3.9 KiB
Diff
From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001
|
|
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
|
|
Date: Thu, 2 Mar 2017 12:19:56 +0100
|
|
Subject: [PATCH] Install mli, cmx, etc.
|
|
|
|
---
|
|
Makefile | 26 +++++++++++++-------------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 09464ff..5044d7f 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%:
|
|
@for i in _build/cudf/cudf.*; do \
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*.mli
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/common.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/pef.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)/pef.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/versioning.% $(DOSELIBS)/pef.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioning.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ; \
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \
|
|
+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \
|
|
fi ; \
|
|
done
|
|
|
|
@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DOSELIBS)/debian.%
|
|
if [ -e $$i ]; then \
|
|
cp $$i $(DOSELIBS) ;\
|
|
rm $$i ;\
|
|
- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\
|
|
+ rm -f $(DOSELIBS)/*.mlpack ;\
|
|
fi ; \
|
|
done
|
|
|
|
@@ -223,7 +223,7 @@ INSTALL_STUFF_ = META
|
|
INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cma _build/doselibs/*.cmi)
|
|
INSTALL_STUFF_ += $(wildcard _build/doselibs/*.cmxa _build/doselibs/*.cmxs)
|
|
INSTALL_STUFF_ += $(wildcard _build/doselibs/*.a)
|
|
-#INSTALL_STUFF_ += $(wildcard _build/*/*.mli)
|
|
+INSTALL_STUFF_ += $(wildcard _build/doselibs/*.mli) $(wildcard _build/doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx)
|
|
INSTALL_STUFF_ += $(wildcard _build/rpm/*.so)
|
|
|
|
exclude_cudf = $(wildcard _build/doselibs/*cudf* _build/cudf/*)
|
|
--
|
|
2.11.0
|
|
|