Skip to content

Commit

Permalink
+ocamlfind-windows.1.9.6 (ocaml-cross#308)
Browse files Browse the repository at this point in the history
  • Loading branch information
toots authored Feb 26, 2024
1 parent 4e74c59 commit d794110
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 44 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--- findlib-1.9.6/src/findlib/Makefile.orig 2024-02-26 09:43:44
+++ findlib-1.9.6/src/findlib/Makefile 2024-02-26 09:44:33
@@ -13,9 +13,9 @@
NAME = findlib

# Need compiler-libs since ocaml-4.00
-OCAMLC = ocamlc -I +compiler-libs
-OCAMLOPT = ocamlopt -I +compiler-libs $(OCAMLOPT_G)
-OCAMLDEP = ocamldep
+OCAMLC = ocamlfind ocamlc -I +compiler-libs
+OCAMLOPT = ocamlfind ocamlopt -I +compiler-libs $(OCAMLOPT_G)
+OCAMLDEP = ocamlfind ocamldep
OCAMLLEX = ocamllex
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo --
@@ -41,10 +41,10 @@
DYNLOAD_XOBJECTS = $(DYNLOAD_OBJECTS:.cmo=.cmx)


-all: ocamlfind$(EXEC_SUFFIX) findlib.cma findlib_top.cma topfind $(NUMTOP) \
+all: findlib.cma findlib_top.cma topfind $(NUMTOP) \
findlib_dynload.cma

-opt: ocamlfind_opt$(EXEC_SUFFIX) findlib.cmxa findlib_top.cmxa topfind \
+opt: findlib.cmxa findlib_top.cmxa topfind \
findlib_dynload.cmxa

num-top: num_top.cma
@@ -134,8 +134,6 @@
findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi \
META` && \
$(INSTALLFILE) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"
- f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- $(INSTALLFILE) $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
# the following "if" block is only needed for 4.00beta2
if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ build: [
["env" "OCAMLFIND_TOOLCHAIN=windows" make "opt"] {ocaml:native}
]
install: [
["env" "OCAMLFIND_TOOLCHAIN=windows" make "install"]
["env" "OCAMLFIND_TOOLCHAIN=windows" "INSTALLDIR=mkdir -p" "INSTALLFILE=cp" make "install"]
]
extra-files: [
["patches/use-host-ocamlfind.patch" "md5=ad77f0d9f8a730670b3ff84e9b663fab"]
["patches/use-host-ocamlfind.patch" "md5=3d2b8e64f8cd4f0aad9af2d667da43b3"]
["Makefile.config.in" "md5=361631c295fc31df6a163b0fdf78df0e"]
]
dev-repo: "git+https://github.com/ocaml/ocamlfind.git"
url {
src: "http://download.camlcity.org/download/findlib-1.9.1.tar.gz"
src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz"
checksum: [
"md5=65e6dc9b305ccbed1267275fe180f538"
"sha512=83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84"
"md5=96c6ee50a32cca9ca277321262dbec57"
"sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027"
]
}

0 comments on commit d794110

Please sign in to comment.