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

[Git][ocaml-team/findlib][master] 3 commits: Fix build with OCaml 5.x

Title: GitLab

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:

Changes:

  • debian/changelog
    1 
    +findlib (1.9.6-2) unstable; urgency=medium
    2 
    +
    3 
    +  * Fix build with OCaml 5.x
    4 
    +
    5 
    + -- Stéphane Glondu <glondu@debian.org>  Sat, 15 Jun 2024 07:24:02 +0200
    6 
    +
    1 7 
     findlib (1.9.6-1) unstable; urgency=medium
    2 8
    3 9 
       * New upstream release

  • debian/libfindlib-ocaml.install.in
    ... ... @@ -4,13 +4,13 @@ etc/ocamlfind.conf
    4 4 
     @OCamlStdlibDir@/findlib/findlib_dynload.cma
    5 5 
     DYN: @OCamlStdlibDir@/findlib/findlib.cmxs
    6 6 
     DYN: @OCamlStdlibDir@/findlib/findlib_dynload.cmxs
    7 
    -@OCamlStdlibDir@/ocamldoc/META
    8 
    -@OCamlStdlibDir@/dynlink/META
    9 
    -@OCamlStdlibDir@/str/META
    10 
    -@OCamlStdlibDir@/stdlib/META
    7 
    +META: @OCamlStdlibDir@/ocamldoc/META
    8 
    +META: @OCamlStdlibDir@/dynlink/META
    9 
    +META: @OCamlStdlibDir@/str/META
    10 
    +META: @OCamlStdlibDir@/stdlib/META
    11 11 
     @OCamlStdlibDir@/bytes/META
    12 
    -@OCamlStdlibDir@/unix/META
    13 
    -@OCamlStdlibDir@/bigarray/META
    14 
    -@OCamlStdlibDir@/compiler-libs/META
    15 
    -@OCamlStdlibDir@/threads/META
    12 
    +META: @OCamlStdlibDir@/unix/META
    13 
    +META: @OCamlStdlibDir@/bigarray/META
    14 
    +META: @OCamlStdlibDir@/compiler-libs/META
    15 
    +META: @OCamlStdlibDir@/threads/META
    16 16 
     @OCamlStdlibDir@/raw_spacetime/META

  • debian/rules
    ... ... @@ -32,6 +32,15 @@ ifeq (,$(wildcard $(OCAML_STDLIB_DIR)/raw_spacetime_lib.cmxa))
    32 32 
       OCAMLINIT_SED += -e '\,raw_spacetime/META,d'
    33 33 
     endif
    34 34
    35 
    +# Adjustments for OCaml 5.x
    36 
    +ifeq (,$(filter 5.%,$(OCAML_ABI)))
    37 
    +  OCAMLINIT_SED += -e 's/^META: //'
    38 
    +else
    39 
    +  OCAMLINIT_SED += -e '/^META: /d'
    40 
    +  dynlink_subdir = dynlink
    41 
    +  export dynlink_subdir
    42 
    +endif
    43 
    +
    35 44 
     export OCAMLINIT_SED
    36 45
    37 46 
     .PHONY: override_dh_auto_install

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

    Reply to: