From 7aac8d717dee9eeee4acba95637bf618f4897357 Mon Sep 17 00:00:00 2001
From: Lucas Pluvinage <lucas.pluvinage@gmail.com>
Date: Mon, 11 Mar 2019 16:48:05 +0100
Subject: [PATCH 1/4] Use virtual libraries.

---
 META.checkseum.template | 4 ----
 checkseum.opam          | 4 ++--
 dune-project            | 2 +-
 src-c/dune              | 4 +---
 src-ocaml/dune          | 5 ++---
 src/dune                | 4 ++--
 6 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 META.checkseum.template

diff --git a/META.checkseum.template b/META.checkseum.template
deleted file mode 100644
index 994d60c..0000000
--- a/META.checkseum.template
+++ /dev/null
@@ -1,4 +0,0 @@
-# DUNE_GEN
-
-xen_linkopts = "-l:laolao/xen/liblaolao_xen_stubs.a"
-freestanding_linkopts = "-l:laolao/freestanding/liblaolao_freestanding_stubs.a"
\ No newline at end of file
diff --git a/checkseum.opam b/checkseum.opam
index 14ebeea..6b8c27a 100644
--- a/checkseum.opam
+++ b/checkseum.opam
@@ -23,7 +23,7 @@ build: [
 
 depends: [
   "ocaml"         {>= "4.03.0"}
-  "dune"          {build}
+  "dune"          {build & >= "1.7"}
   "optint"
   "base-bytes"
   "base-bigarray"
@@ -41,4 +41,4 @@ depopts: [
 conflicts: [
   "mirage-xen-posix" {< "3.1.0"}
   "ocaml-freestanding" {< "0.4.1"}
-]
\ No newline at end of file
+]
diff --git a/dune-project b/dune-project
index af4d5b7..cab458b 100644
--- a/dune-project
+++ b/dune-project
@@ -1,3 +1,3 @@
-(lang dune 1.0)
+(lang dune 1.7)
 (name checkseum)
 (version dev)
diff --git a/src-c/dune b/src-c/dune
index 815ecbf..aaaf563 100644
--- a/src-c/dune
+++ b/src-c/dune
@@ -2,7 +2,5 @@
  (name checkseum_c)
  (public_name checkseum.c)
  (libraries bigarray optint checkseum.laolao)
- (wrapped false)
+ (implements checkseum)
  (flags (:standard -no-keep-locs)))
-
-(rule (copy# %{lib:checkseum:checkseum.mli} checkseum.mli))
diff --git a/src-ocaml/dune b/src-ocaml/dune
index bbc9cf0..7dc8fa1 100644
--- a/src-ocaml/dune
+++ b/src-ocaml/dune
@@ -2,7 +2,6 @@
  (name checkseum_ocaml)
  (public_name checkseum.ocaml)
  (libraries bigarray optint)
- (wrapped false)
+ (implements checkseum)
+ (private_modules gin_adler32 gin_crc32 gin_crc32c)
  (flags (:standard -no-keep-locs)))
-
-(rule (copy# %{lib:checkseum:checkseum.mli} checkseum.mli))
diff --git a/src/dune b/src/dune
index 97a1c7b..0cbf8c9 100644
--- a/src/dune
+++ b/src/dune
@@ -2,6 +2,6 @@
  (name checkseum)
  (public_name checkseum)
  (libraries optint)
+ (virtual_modules checkseum)
  (wrapped false)
- (flags (:standard -no-keep-locs))
- (modules_without_implementation checkseum))
+ (flags (:standard -no-keep-locs)))

From 36e44c161684bffd5429f643ce440605928395bc Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Wed, 15 May 2019 14:30:30 +0200
Subject: [PATCH 2/4] Default implementation is checkseum.c

---
 dune-project | 1 +
 src/dune     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dune-project b/dune-project
index cab458b..beb521b 100644
--- a/dune-project
+++ b/dune-project
@@ -1,3 +1,4 @@
 (lang dune 1.7)
+(using library_variants 0.1)
 (name checkseum)
 (version dev)
diff --git a/src/dune b/src/dune
index 0cbf8c9..571e350 100644
--- a/src/dune
+++ b/src/dune
@@ -3,5 +3,6 @@
  (public_name checkseum)
  (libraries optint)
  (virtual_modules checkseum)
+ (default_implementation checkseum.c)
  (wrapped false)
  (flags (:standard -no-keep-locs)))

From d1e959810884a6324c30df51248d76f9580facbd Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Wed, 15 May 2019 14:36:02 +0200
Subject: [PATCH 3/4] Remove useless no-keep-locs

---
 src-c/dune     | 3 +--
 src-ocaml/dune | 3 +--
 src/dune       | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src-c/dune b/src-c/dune
index aaaf563..0001c6c 100644
--- a/src-c/dune
+++ b/src-c/dune
@@ -2,5 +2,4 @@
  (name checkseum_c)
  (public_name checkseum.c)
  (libraries bigarray optint checkseum.laolao)
- (implements checkseum)
- (flags (:standard -no-keep-locs)))
+ (implements checkseum))
diff --git a/src-ocaml/dune b/src-ocaml/dune
index 7dc8fa1..435cfd9 100644
--- a/src-ocaml/dune
+++ b/src-ocaml/dune
@@ -3,5 +3,4 @@
  (public_name checkseum.ocaml)
  (libraries bigarray optint)
  (implements checkseum)
- (private_modules gin_adler32 gin_crc32 gin_crc32c)
- (flags (:standard -no-keep-locs)))
+ (private_modules gin_adler32 gin_crc32 gin_crc32c))
diff --git a/src/dune b/src/dune
index 571e350..977a575 100644
--- a/src/dune
+++ b/src/dune
@@ -4,5 +4,4 @@
  (libraries optint)
  (virtual_modules checkseum)
  (default_implementation checkseum.c)
- (wrapped false)
- (flags (:standard -no-keep-locs)))
+ (wrapped false))

From 06dbbb39ad06382a19a72f4c7f3313c33f05111e Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Thu, 16 May 2019 11:23:56 +0200
Subject: [PATCH 4/4] Constraint dune to be up or equal to 1.9.2

---
 checkseum.opam | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checkseum.opam b/checkseum.opam
index 6b8c27a..aa3a1a1 100644
--- a/checkseum.opam
+++ b/checkseum.opam
@@ -23,7 +23,7 @@ build: [
 
 depends: [
   "ocaml"         {>= "4.03.0"}
-  "dune"          {build & >= "1.7"}
+  "dune"          {build & >= "1.9.2"}
   "optint"
   "base-bytes"
   "base-bigarray"