Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / dh-ocaml
Commits: b054ff94 by Stephane Glondu at 2024-06-13T15:07:32+02:00 Cope with move of dynlink.cmxa in OCaml 5.2.0 - - - - - 7535c383 by Stephane Glondu at 2024-06-13T15:07:32+02:00 Update changelog - - - - - a6a216bb by Stephane Glondu at 2024-06-15T07:19:39+02:00 Prepare upload to unstable - - - - - 3 changed files: - debhelper/dh_ocamlinit - debian/changelog - share/ocamlvars.mk Changes: ===================================== debhelper/dh_ocamlinit ===================================== @@ -62,7 +62,8 @@ my $ocamlc = "/usr/bin/ocamlc"; my $ocamlopt = "/usr/bin/ocamlopt"; my $stdlib_path = `$ocamlc -where`; chomp($stdlib_path); -my $dynlinkcmxa = "$stdlib_path/dynlink.cmxa"; +my $dynlinkcmxa = `find $stdlib_path -name dynlink.cmxa`; +chomp($dynlinkcmxa); error "$ocamlc does not exists or is not executable" unless -x $ocamlc; chomp( my $ocaml_version = `$ocamlc -version` ); ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +dh-ocaml (2.1) unstable; urgency=medium + + * Cope with move of dynlink.cmxa in OCaml 5.2.0 + + -- Stéphane Glondu <[email protected]> Sat, 15 Jun 2024 07:19:34 +0200 + dh-ocaml (2.0) unstable; urgency=medium * dh_ocaml: ===================================== share/ocamlvars.mk ===================================== @@ -63,7 +63,7 @@ OCAML_OPT_ARCH ?= $(DEB_BUILD_ARCH) endif # Variable set to yes on architectures with native dynlink -ifneq (,$(wildcard $(OCAML_STDLIB_DIR)/dynlink.cmxa)) +ifneq (,$(shell find $(OCAML_STDLIB_DIR) -name dynlink.cmxa)) OCAML_NATDYNLINK ?= yes else OCAML_NATDYNLINK ?= no View it on GitLab: https://salsa.debian.org/ocaml-team/dh-ocaml/-/compare/145eb05f77fbced5b49fa318dfd746413fd34c4f...a6a216bb9cad5b5245cc94404941258e93b808cb -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/ocaml-team/dh-ocaml/-/compare/145eb05f77fbced5b49fa318dfd746413fd34c4f...a6a216bb9cad5b5245cc94404941258e93b808cb You're receiving this email because of your account on salsa.debian.org.
