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: - debian/changelog - + debian/patches/0001-Fix-FTBFS-when-ocamlopt-is-missing.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +omake (0.10.5-2) unstable; urgency=medium + + * Team upload + * Fix FTBFS when ocamlopt is missing + + -- Stéphane Glondu <[email protected]> Wed, 01 Feb 2023 12:26:13 +0100 + omake (0.10.5-1) unstable; urgency=medium [ Stéphane Glondu ] ===================================== debian/patches/0001-Fix-FTBFS-when-ocamlopt-is-missing.patch ===================================== @@ -0,0 +1,44 @@ +From: =?utf-8?q?St=C3=A9phane_Glondu?= <[email protected]> +Date: Wed, 1 Feb 2023 12:09:24 +0100 +Subject: Fix FTBFS when ocamlopt is missing + +Bug: https://github.com/ocaml-omake/omake/issues/154 +--- + OMakefile | 24 +----------------------- + 1 file changed, 1 insertion(+), 23 deletions(-) + +diff --git a/OMakefile b/OMakefile +index b283f13..ad0c525 100644 +--- a/OMakefile ++++ b/OMakefile +@@ -79,29 +79,7 @@ if $(THREADS_ENABLED) + OCAMLFLAGS += -thread + export + +-compiler_config(a_compiler) = +- config = $(Map) +- foreach(key_value_line => ..., $(shella $(a_compiler) -config)) +- export config +- lex($(open-in-string $(key_value_line))) +- case $'^\([^:]*\):[[:blank:]]*\(.*\)$' +- export config +- config = $(config.add $1, $2) +- return $(config) +- +-static. = +- OCAMLOPT_CONFIG = $(compiler_config $(OCAMLOPT)) +- OCAMLOPT_OPTIMIZER_FLAGS[] = +- ConfMsgChecking($'if ocamlopt was compiled with flambda') +- if $(and $(OCAMLOPT_CONFIG.mem flambda), $(equal $(OCAMLOPT_CONFIG.find flambda), true)) +- ConfMsgResult($'yes') +- OCAMLOPT_OPTIMIZER_FLAGS[] = -O3 +- export +- else +- ConfMsgResult($'no') +- +-OCAMLOPTFLAGS[] = $(OCAMLFLAGS) $(OCAMLOPT_OPTIMIZER_FLAGS) +- ++OCAMLOPTFLAGS[] = $(OCAMLFLAGS) + + # + # Support for profiling ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +0001-Fix-FTBFS-when-ocamlopt-is-missing.patch View it on GitLab: https://salsa.debian.org/ocaml-team/omake/-/compare/92a0340630fe0cc1cf5238e32e9604f02015aec1...7699b9bc92700fd72cbde1ebae78e7ee726a8a3f -- View it on GitLab: https://salsa.debian.org/ocaml-team/omake/-/compare/92a0340630fe0cc1cf5238e32e9604f02015aec1...7699b9bc92700fd72cbde1ebae78e7ee726a8a3f You're receiving this email because of your account on salsa.debian.org.
