Merge pull request #188 from cryspen/franziskus/update-opam-package

update opam packages

ocaml/META

@@ -1,5 +1,5 @@
 name="hacl-star-raw"
-version="0.4.5"
+version="0.5.0"
 description="EverCrypt with Ctypes bindings"
 requires="ctypes"
 archive(native)="ocamlevercrypt.cmxa"

ocaml/Makefile

@@ -45,10 +45,10 @@ C_DYN_LIB?=lib$(DYNAMIC_C_LIB_NAME).$(SO)
 # of build-bindings because it will also write Makefile.config, which is needed
 # by build-bindings.
 build-c:
-	cmake -B build -G"Ninja Multi-Config"
-	ninja -f build-Release.ninja -C build
-	cp build/Release/$(C_LIB) .
-	cp build/Release/$(C_DYN_LIB) .
+	cmake -B build -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
+	make -C build
+	cp build/$(C_LIB) .
+	cp build/$(C_DYN_LIB) .
 
 -include build/Makefile.include
 
@@ -147,7 +147,8 @@ clean:
 # Install hacl-star-raw locally.
 install: dllocamlevercrypt.$(OCAML_SO)
 # We need to remove all comments from config.h because ccpo can't handle them
-	sed -i 's/\(\/\/.*\)\|\(\/\*.*\*\/\)//g' build/config.h
+	sed 's/\(\/\/.*\)\|\(\/\*.*\*\/\)//g' build/config.h > build/config-new.h
+	mv build/config-new.h build/config.h
 	ocamlfind remove hacl-star-raw || true
 	ocamlfind install hacl-star-raw META
 	ocamlfind install -add hacl-star-raw $(CTYPES_ML)

ocaml/hacl-star-raw.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "hacl-star-raw"
-version: "0.4.5"
+version: "0.5.0"
 synopsis: "Auto-generated low-level OCaml bindings for EverCrypt/HACL*"
 description: """
 This package contains a snapshot of the EverCrypt crypto provider and
@@ -18,6 +18,7 @@ depends: [
   "ocamlfind" {build}
   "ctypes" { >= "0.18.0" }
   "conf-which" {build}
+  "conf-cmake" {build}
 ]
 available: [
   arch != "ppc64" & arch != "ppc32" &

ocaml/hacl-star/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.5.0
+- New build system
+- Faster blake2b
+- Agile incremental APIs for blake2
+
 ## 0.4.5
 - Faster fallback implementations for certain intrinsics, leading to improved
   performance, notably on ARMv8

ocaml/hacl-star/hacl-star.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "hacl-star"
-version: "0.4.5"
+version: "0.5.0"
 synopsis: "OCaml API for EverCrypt/HACL*"
 description: """
 Documentation for this library can be found
@@ -24,12 +24,17 @@ available: [
   os = "freebsd" | os-family != "bsd"
 ]
 build: [
+  ["dune" "subst"] {dev}
   [
-    "dune" "build" "-p" name "-j" jobs
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-run-test: [
-  ["dune" "runtest" "-p" name "-j" jobs]
-]
 dev-repo: "git+https://github.com/project-everest/hacl-star.git"