Ralf Treinen pushed to branch master at Debian OCaml Maintainers / why3


Commits:
dbabf2ff by Ralf Treinen at 2022-03-19T15:02:04+01:00
on bytecode archs, WHY3HYPO_UNITS must be obtained from why3ide.cma

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+why3 (1.4.1-2) unstable; urgency=medium
+
+  * Fix compilation on bytecode architectures, on these architectures we
+    have to look for exported units in why3ide.cma.
+
+ -- Ralf Treinen <[email protected]>  Sat, 19 Mar 2022 15:01:40 +0100
+
 why3 (1.4.1-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/rules
=====================================
@@ -50,14 +50,10 @@ override_dh_compress:
 ifneq ($(wildcard debian/why3/usr/lib/ocaml/why3/commands/why3ide.cmxs),)
   WHY3IDE_UNITS := $(shell ocamlobjinfo 
debian/why3/usr/lib/ocaml/why3/commands/why3ide.cmxs | sed -n 's/Name: //p' | 
xargs echo | tr ' ' ,)
 else
-  WHY3IDE_UNITS :=
+  WHY3IDE_UNITS := $(shell ocamlobjinfo 
debian/why3/usr/lib/ocaml/why3/commands/why3ide.cma | sed -n 's/Unit name: //p' 
| xargs echo | tr ' ' ,)
 endif
 
-ifneq ($(wildcard 
debian/why3/usr/lib/ocaml/why3/plugins/hypothesis_selection.cma ),)
-  WHY3HYPO_UNITS := $(shell ocamlobjinfo 
debian/why3/usr/lib/ocaml/why3/plugins/hypothesis_selection.cma | sed -n 
's/Unit name: //p' | xargs echo | tr ' ' ,)
-else
-  WHY3HYPO_UNITS :=
-endif
+WHY3HYPO_UNITS := $(shell ocamlobjinfo 
debian/why3/usr/lib/ocaml/why3/plugins/hypothesis_selection.cma | sed -n 
's/Unit name: //p' | xargs echo | tr ' ' ,)
 
 override_dh_ocaml:
        dh_ocaml --nodefined-map=why3:$(WHY3IDE_UNITS),$(WHY3HYPO_UNITS)



View it on GitLab: 
https://salsa.debian.org/ocaml-team/why3/-/commit/dbabf2ff519d0708fddb2784413d43a0e2947ba3

-- 
View it on GitLab: 
https://salsa.debian.org/ocaml-team/why3/-/commit/dbabf2ff519d0708fddb2784413d43a0e2947ba3
You're receiving this email because of your account on salsa.debian.org.


Reply via email to