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

[Git][ocaml-team/omake][master] 2 commits: Fix FTBFS when ocamlopt is missing

Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / omake

Commits:

  • faffab80
    by Stéphane Glondu at 2023-02-01T12:09:58+01:00 
    Fix FTBFS when ocamlopt is missing
  • 7699b9bc
    by Stéphane Glondu at 2023-02-01T12:26:17+01:00 
    Update changelog and prepare upload to unstable

3 changed files:

Changes:

  • debian/changelog
    1 
    +omake (0.10.5-2) unstable; urgency=medium
    2 
    +
    3 
    +  * Team upload
    4 
    +  * Fix FTBFS when ocamlopt is missing
    5 
    +
    6 
    + -- Stéphane Glondu <glondu@debian.org>  Wed, 01 Feb 2023 12:26:13 +0100
    7 
    +
    1 8 
     omake (0.10.5-1) unstable; urgency=medium
    2 9
    3 10 
       [ Stéphane Glondu ]

  • debian/patches/0001-Fix-FTBFS-when-ocamlopt-is-missing.patch
    1 
    +From: =?utf-8?q?St=C3=A9phane_Glondu?= <steph@glondu.net>
    2 
    +Date: Wed, 1 Feb 2023 12:09:24 +0100
    3 
    +Subject: Fix FTBFS when ocamlopt is missing
    4 
    +
    5 
    +Bug: https://github.com/ocaml-omake/omake/issues/154
    6 
    +---
    7 
    + OMakefile | 24 +-----------------------
    8 
    + 1 file changed, 1 insertion(+), 23 deletions(-)
    9 
    +
    10 
    +diff --git a/OMakefile b/OMakefile
    11 
    +index b283f13..ad0c525 100644
    12 
    +--- a/OMakefile
    13 
    ++++ b/OMakefile
    14 
    +@@ -79,29 +79,7 @@ if $(THREADS_ENABLED)
    15 
    +     OCAMLFLAGS += -thread
    16 
    +     export
    17 
    +
    18 
    +-compiler_config(a_compiler) =
    19 
    +-        config = $(Map)
    20 
    +-        foreach(key_value_line => ..., $(shella $(a_compiler) -config))
    21 
    +-            export config
    22 
    +-            lex($(open-in-string $(key_value_line)))
    23 
    +-            case $'^\([^:]*\):[[:blank:]]*\(.*\)$'
    24 
    +-                export config
    25 
    +-                config = $(config.add $1, $2)
    26 
    +-        return $(config)
    27 
    +-
    28 
    +-static. =
    29 
    +-    OCAMLOPT_CONFIG = $(compiler_config $(OCAMLOPT))
    30 
    +-    OCAMLOPT_OPTIMIZER_FLAGS[] =
    31 
    +-    ConfMsgChecking($'if ocamlopt was compiled with flambda')
    32 
    +-    if $(and $(OCAMLOPT_CONFIG.mem flambda), $(equal $(OCAMLOPT_CONFIG.find flambda), true))
    33 
    +-        ConfMsgResult($'yes')
    34 
    +-        OCAMLOPT_OPTIMIZER_FLAGS[] = -O3
    35 
    +-        export
    36 
    +-    else
    37 
    +-        ConfMsgResult($'no')
    38 
    +-
    39 
    +-OCAMLOPTFLAGS[] = $(OCAMLFLAGS) $(OCAMLOPT_OPTIMIZER_FLAGS)
    40 
    +-
    41 
    ++OCAMLOPTFLAGS[] = $(OCAMLFLAGS)
    42 
    +
    43 
    + #
    44 
    + # Support for profiling

  • debian/patches/series
    1 
    +0001-Fix-FTBFS-when-ocamlopt-is-missing.patch

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

    Reply to: