Merge pull request #592 from dra27/clarify-config

Clarify configuration for lib_eio_linux and enable tests on other arches

Author: talex5

lib_eio_linux/dune

@@ -2,10 +2,10 @@
  (name eio_linux)
  (public_name eio_linux)
  (enabled_if ; See https://github.com/ocaml/dune/issues/4895
-   (or (= %{system} "linux")          ; Linux-x86
-       (= %{system} "linux_eabihf")   ; Linux-arm32
-       (= %{system} "linux_elf")      ; Linux-x86_32
-       (= %{system} "elf")))          ; Linux-ppc64
+   (or (= %{system} "linux")          ; Historically, just Linux-x86
+       (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+       (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+       (= %{system} "elf")))          ; Historically, Linux-ppc64
  (foreign_stubs
   (language c)
   (flags :standard -D_LARGEFILE64_SOURCE)

lib_eio_linux/tests/dune

@@ -1,35 +1,59 @@
 (library
  (name eurcp_lib)
- (enabled_if (= %{system} "linux"))
+ (enabled_if ; See https://github.com/ocaml/dune/issues/4895
+   (or (= %{system} "linux")          ; Historically, just Linux-x86
+       (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+       (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+       (= %{system} "elf")))          ; Historically, Linux-ppc64
  (modules eurcp_lib)
  (libraries eio_linux))
 
 (executable
  (name eurcp)
- (enabled_if (= %{system} "linux"))
+ (enabled_if ; See https://github.com/ocaml/dune/issues/4895
+   (or (= %{system} "linux")          ; Historically, just Linux-x86
+       (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+       (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+       (= %{system} "elf")))          ; Historically, Linux-ppc64
  (modules eurcp)
  (libraries cmdliner logs.cli logs.fmt fmt.tty fmt.cli eurcp_lib))
 
 (executable
  (name basic_eio_linux)
- (enabled_if (= %{system} "linux"))
+ (enabled_if ; See https://github.com/ocaml/dune/issues/4895
+   (or (= %{system} "linux")          ; Historically, just Linux-x86
+       (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+       (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+       (= %{system} "elf")))          ; Historically, Linux-ppc64
  (modules basic_eio_linux)
  (libraries logs.fmt fmt.tty eurcp_lib))
 
 (executables
   (names bench_noop)
-  (enabled_if (= %{system} "linux"))
+  (enabled_if ; See https://github.com/ocaml/dune/issues/4895
+    (or (= %{system} "linux")          ; Historically, just Linux-x86
+        (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+        (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+        (= %{system} "elf")))          ; Historically, Linux-ppc64
   (modules bench_noop)
   (libraries eio_linux))
 
 (test
  (name test)
  (package eio_linux)
- (build_if (= %{system} "linux"))
+ (build_if ; See https://github.com/ocaml/dune/issues/4895
+   (or (= %{system} "linux")          ; Historically, just Linux-x86
+       (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+       (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+       (= %{system} "elf")))          ; Historically, Linux-ppc64
  (modules test)
  (libraries alcotest eio_linux))
 
 (mdx
   (package eio_linux)
-  (enabled_if (= %{system} "linux"))
+  (enabled_if ; See https://github.com/ocaml/dune/issues/4895
+    (or (= %{system} "linux")          ; Historically, just Linux-x86
+        (= %{system} "linux_eabihf")   ; Historically, Linux-arm32
+        (= %{system} "linux_elf")      ; Historically, Linux-x86_32
+        (= %{system} "elf")))          ; Historically, Linux-ppc64
   (deps (package eio_linux)))