[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/dh-ocaml][master] 3 commits: Cope with move of dynlink.cmxa in OCaml 5.2.0

Title: GitLab

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:

Changes:

  • debhelper/dh_ocamlinit
    ... ... @@ -62,7 +62,8 @@ my $ocamlc = "/usr/bin/ocamlc";
    62 62 
     my $ocamlopt    = "/usr/bin/ocamlopt";
    63 63 
     my $stdlib_path = `$ocamlc -where`;
    64 64 
     chomp($stdlib_path);
    65 
    -my $dynlinkcmxa = "$stdlib_path/dynlink.cmxa";
    65 
    +my $dynlinkcmxa = `find $stdlib_path -name dynlink.cmxa`;
    66 
    +chomp($dynlinkcmxa);
    66 67 
     error "$ocamlc does not exists or is not executable" unless -x $ocamlc;
    67 68
    68 69 
     chomp( my $ocaml_version = `$ocamlc -version` );

  • debian/changelog
    1 
    +dh-ocaml (2.1) unstable; urgency=medium
    2 
    +
    3 
    +  * Cope with move of dynlink.cmxa in OCaml 5.2.0
    4 
    +
    5 
    + -- Stéphane Glondu <glondu@debian.org>  Sat, 15 Jun 2024 07:19:34 +0200
    6 
    +
    1 7 
     dh-ocaml (2.0) unstable; urgency=medium
    2 8
    3 9 
       * dh_ocaml:

  • share/ocamlvars.mk
    ... ... @@ -63,7 +63,7 @@ OCAML_OPT_ARCH ?= $(DEB_BUILD_ARCH)
    63 63 
     endif
    64 64
    65 65 
     # Variable set to yes on architectures with native dynlink
    66 
    -ifneq (,$(wildcard $(OCAML_STDLIB_DIR)/dynlink.cmxa))
    66 
    +ifneq (,$(shell find $(OCAML_STDLIB_DIR) -name dynlink.cmxa))
    67 67 
       OCAML_NATDYNLINK ?= yes
    68 68 
     else
    69 69 
       OCAML_NATDYNLINK ?= no

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: