Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / findlib
Commits: aeb11639 by Stephane Glondu at 2024-06-13T14:32:31+02:00 Fix build with OCaml 5.x - - - - - 25087ffc by Stephane Glondu at 2024-06-13T14:32:31+02:00 Update changelog - - - - - 50eabc0c by Stephane Glondu at 2024-06-15T07:24:04+02:00 Prepare upload to unstable - - - - - 3 changed files: - debian/changelog - debian/libfindlib-ocaml.install.in - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +findlib (1.9.6-2) unstable; urgency=medium + + * Fix build with OCaml 5.x + + -- Stéphane Glondu <[email protected]> Sat, 15 Jun 2024 07:24:02 +0200 + findlib (1.9.6-1) unstable; urgency=medium * New upstream release ===================================== debian/libfindlib-ocaml.install.in ===================================== @@ -4,13 +4,13 @@ etc/ocamlfind.conf @OCamlStdlibDir@/findlib/findlib_dynload.cma DYN: @OCamlStdlibDir@/findlib/findlib.cmxs DYN: @OCamlStdlibDir@/findlib/findlib_dynload.cmxs -@OCamlStdlibDir@/ocamldoc/META -@OCamlStdlibDir@/dynlink/META -@OCamlStdlibDir@/str/META -@OCamlStdlibDir@/stdlib/META +META: @OCamlStdlibDir@/ocamldoc/META +META: @OCamlStdlibDir@/dynlink/META +META: @OCamlStdlibDir@/str/META +META: @OCamlStdlibDir@/stdlib/META @OCamlStdlibDir@/bytes/META -@OCamlStdlibDir@/unix/META -@OCamlStdlibDir@/bigarray/META -@OCamlStdlibDir@/compiler-libs/META -@OCamlStdlibDir@/threads/META +META: @OCamlStdlibDir@/unix/META +META: @OCamlStdlibDir@/bigarray/META +META: @OCamlStdlibDir@/compiler-libs/META +META: @OCamlStdlibDir@/threads/META @OCamlStdlibDir@/raw_spacetime/META ===================================== debian/rules ===================================== @@ -32,6 +32,15 @@ ifeq (,$(wildcard $(OCAML_STDLIB_DIR)/raw_spacetime_lib.cmxa)) OCAMLINIT_SED += -e '\,raw_spacetime/META,d' endif +# Adjustments for OCaml 5.x +ifeq (,$(filter 5.%,$(OCAML_ABI))) + OCAMLINIT_SED += -e 's/^META: //' +else + OCAMLINIT_SED += -e '/^META: /d' + dynlink_subdir = dynlink + export dynlink_subdir +endif + export OCAMLINIT_SED .PHONY: override_dh_auto_install View it on GitLab: https://salsa.debian.org/ocaml-team/findlib/-/compare/d5fc4f00ace8b612efcdc0841434cd05bb835d1d...50eabc0c5d74db3c266cf46d3feefca6c8b49aca -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/ocaml-team/findlib/-/compare/d5fc4f00ace8b612efcdc0841434cd05bb835d1d...50eabc0c5d74db3c266cf46d3feefca6c8b49aca You're receiving this email because of your account on salsa.debian.org.
