<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e89b0f8272c87ac0fa6ce1f310a5a3e012f47505">https://github.com/macports/macports-ports/commit/e89b0f8272c87ac0fa6ce1f310a5a3e012f47505</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e89b0f8272c87ac0fa6ce1f310a5a3e012f47505
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Tue May 11 10:24:17 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> ocaml-hacl-star: update to 20210510-bd790d3
</span>---
ocaml/ocaml-hacl-star/Portfile | 35 +++++++++++-----------
ocaml/ocaml-hacl-star/files/patch-Makefile.diff | 8 ++---
.../patch-dist-gcc-compatible-use-install_name | 12 ++++----
3 files changed, 28 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-hacl-star/Portfile b/ocaml/ocaml-hacl-star/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0839b604a5e..05b64320a51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-hacl-star/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-hacl-star/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup github 1.0
</span> PortGroup ocaml 1.1
name ocaml-hacl-star
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup project-everest hacl-star 96ad4e4574bf71f4398d18d1fabae645b258b04f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210118-[string range ${github.version} 0 6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup project-everest hacl-star bd790d3c2b6548d877f57437bf2bd1e32ba88249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210510-[string range ${github.version} 0 6]
</span>
categories ocaml devel security
maintainers {landonf @landonf} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ platforms darwin
</span> options vale.version vale.distname vale.distfile
options hacl-star.make_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-vale.version 0.3.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+vale.version 0.3.16
</span> vale.distname vale-release-${vale.version}
vale.distfile ${vale.distname}.zip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,13 +35,13 @@ patchfiles patch-Makefile.diff \
</span> patch-dist-gcc-compatible-use-install_name
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 432cdf7e3df3a0be260d063324781eee5265230b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 46e98e5796f24b35c7fcfbfe340ab525aec7c7521d4d368479f7d58db3a761a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7859673 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8a1303b055b040b8aeb33e2d5de61516282a215b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cc7539b6efeb310dbab96328b2fb9751f9ff681774167f12f22fd446533957d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8811328 \
</span> ${vale.distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f3e032b48caee2af28edc209bf11e99dbcde5fb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3fe3b4ddbeff2faeeca76b142e36412d711a6223c81edd3b3cc2d54f9d979619 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3073108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 32eeb48eb90ce19703175904f600bc4d94973cbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1bb1af63258c1e8dad7431b259d09480d07d345b386d52262f63f9e119faf4cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3072558
</span>
extract.only ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,16 +64,14 @@ subport ocaml-hacl-star-raw {
</span> ocaml.use_findlib yes
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ocaml-ctypes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Common make arguments
hacl-star.make_args HACL_HOME="${worksrcpath}" \
FSTAR_HOME="${prefix}/libexec/fstar-devel/home" \
KREMLIN_HOME="${prefix}/libexec/kremlin-devel/home" \
VALE_HOME="${worksrcpath}/${vale.distname}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_HOME="${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MONO="${prefix}/bin/mono" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SED="${prefix}/bin/gsed" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TIME="${prefix}/bin/gtime" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OTHERFLAGS="--z3rlimit_factor 32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENSSL_HOME="${prefix}/lib"
</span>
build.cmd ${prefix}/bin/gmake
build.args-append {*}${hacl-star.make_args}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,8 +82,11 @@ subport ocaml-hacl-star-raw {
</span> }
subport ocaml-hacl-star {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ocaml-hacl-star-raw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ocaml-hacl-star-raw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-zarith
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:ocaml-cppo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ocaml.build_type dune
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dune.root ${worksrcpath}/bindings/ocaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocaml.build_type dune
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dune.root ${worksrcpath}/bindings/ocaml
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-hacl-star/files/patch-Makefile.diff b/ocaml/ocaml-hacl-star/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 11e6a2c4549..65473a91c60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-hacl-star/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-hacl-star/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2020-11-30 16:17:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2020-11-30 16:17:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1075,8 +1075,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-05-10 11:16:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-05-11 12:46:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1126,8 +1126,6 @@
</span> ###################################################################################
copy-kremlib:
- mkdir -p dist/kremlin
- (cd $(KREMLIN_HOME) && tar cvf - kremlib/dist/minimal include) | (cd dist/kremlin && tar xf -)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compile-%: dist/Makefile.tmpl dist/%/Makefile.basic | copy-kremlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compile-%: dist/Makefile.tmpl dist/configure dist/%/Makefile.basic | copy-kremlib
</span> cp $< dist/$*/Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-hacl-star/files/patch-dist-gcc-compatible-use-install_name b/ocaml/ocaml-hacl-star/files/patch-dist-gcc-compatible-use-install_name
</span><span style='display:block; white-space:pre;color:#808080;'>index edb11eb57d6..5424db09dab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-hacl-star/files/patch-dist-gcc-compatible-use-install_name
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-hacl-star/files/patch-dist-gcc-compatible-use-install_name
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dist/Makefile.tmpl.orig 2021-01-18 19:27:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dist/Makefile.tmpl 2021-01-18 19:41:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: libevercrypt.$(SO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/Makefile.tmpl.orig 2021-05-10 11:16:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dist/Makefile.tmpl 2021-05-11 12:46:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,7 +104,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch $@
</span>
libevercrypt.$(SO): config.h $(OBJS)
- $(CC) $(CFLAGS) -shared -o $@ $(filter-out %.h,$^) $(LDFLAGS)
+ $(CC) $(CFLAGS) -shared -o $@ $(filter-out %.h,$^) $(LDFLAGS) \
+ -Wl,-install_name,"$(shell ocamlfind printconf destdir)/stublibs/$@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If the configure script has not run, create an empty config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.h:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 4. Compilation of OCaml bindings; conditional on the presence of the lib_gen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # folder, possibly disabled by configure.
</span></pre><pre style='margin:0'>
</pre>