diff --git a/packages/ocamlfind-windows/ocamlfind-windows.1.9.1/files/patches/use-host-ocamlfind.patch b/packages/ocamlfind-windows/ocamlfind-windows.1.9.1/files/patches/use-host-ocamlfind.patch deleted file mode 100644 index c255ca93..00000000 --- a/packages/ocamlfind-windows/ocamlfind-windows.1.9.1/files/patches/use-host-ocamlfind.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/findlib/Makefile b/src/findlib/Makefile -index 6ec8a71..d3e79eb 100644 ---- a/src/findlib/Makefile -+++ b/src/findlib/Makefile -@@ -13,9 +13,9 @@ include $(TOP)/Makefile.config - NAME = findlib - - # Need compiler-libs since ocaml-4.00 --OCAMLC = ocamlc -I +compiler-libs --OCAMLOPT = ocamlopt -I +compiler-libs -g --OCAMLDEP = ocamldep -+OCAMLC = ocamlfind ocamlc -I +compiler-libs -+OCAMLOPT = ocamlfind ocamlopt -I +compiler-libs -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 -- -@@ -38,10 +38,10 @@ DYNLOAD_OBJECTS = fl_dynload.cmo - 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 -@@ -123,8 +123,6 @@ install: all - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" - files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs 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_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) 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)"; }; \ -- cp $$f "$(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/"; \ diff --git a/packages/ocamlfind-windows/ocamlfind-windows.1.9.1/files/Makefile.config.in b/packages/ocamlfind-windows/ocamlfind-windows.1.9.6/files/Makefile.config.in similarity index 100% rename from packages/ocamlfind-windows/ocamlfind-windows.1.9.1/files/Makefile.config.in rename to packages/ocamlfind-windows/ocamlfind-windows.1.9.6/files/Makefile.config.in diff --git a/packages/ocamlfind-windows/ocamlfind-windows.1.9.6/files/patches/use-host-ocamlfind.patch b/packages/ocamlfind-windows/ocamlfind-windows.1.9.6/files/patches/use-host-ocamlfind.patch new file mode 100644 index 00000000..fd91d9be --- /dev/null +++ b/packages/ocamlfind-windows/ocamlfind-windows.1.9.6/files/patches/use-host-ocamlfind.patch @@ -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/"; \ diff --git a/packages/ocamlfind-windows/ocamlfind-windows.1.9.1/opam b/packages/ocamlfind-windows/ocamlfind-windows.1.9.6/opam similarity index 72% rename from packages/ocamlfind-windows/ocamlfind-windows.1.9.1/opam rename to packages/ocamlfind-windows/ocamlfind-windows.1.9.6/opam index aa072fb9..32f3d98e 100644 --- a/packages/ocamlfind-windows/ocamlfind-windows.1.9.1/opam +++ b/packages/ocamlfind-windows/ocamlfind-windows.1.9.6/opam @@ -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" ] }