<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/14f74b925f9b6fa6b12fc43eec7b9c37c1cb1719">https://github.com/macports/macports-ports/commit/14f74b925f9b6fa6b12fc43eec7b9c37c1cb1719</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 14f74b925f9b6fa6b12fc43eec7b9c37c1cb1719
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Fri Apr 23 18:05:35 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> (fstar|kremlin)-devel: update to (20210423|20210322)-(e3b68bd|6e60e33).
</span>---
lang/fstar/Portfile | 62 +++++++++++-----------
.../files/kremlin-devel/patch-fix-make-command | 25 ---------
2 files changed, 32 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/Portfile b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 85ed4e0892a..0a9b50d39ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${fstar.stable}} {
</span> # Strip everything but <major>.<minor>
fstar.release [regsub {^([^\.]+\.[^\.]+).*} ${fstar.version} {\1}]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fstar.version 20210113
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fstar.version 20210423
</span> fstar.release devel
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,8 +112,6 @@ if {${fstar.project} eq "fstar"} {
</span> depends_build-append port:coreutils
depends_lib-append port:z3-fstar \
port:gmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ocaml-ulex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ocaml-migrate-parsetree \
</span> port:realpath
depends_run-append port:fstar_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,19 +171,40 @@ subport fstar {
</span>
patchfiles-append fstar-stable/patch-ocaml4.08 \
fstar-stable/patch-examples-fix-tests
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ocaml-ulex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-migrate-parsetree
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args PREFIX=${fstar.home}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {dir ftargets} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src {ocaml-fstar-ocaml}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ulib {install-fstarlib install-fstar-tactics all}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target {*}${ftargets}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${worksrcpath}/src/ocaml-output
</span> }
subport fstar-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup ${github.author} ${github.project} 10b73d927999eac56e4bb0dddf05a14ee39f4372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ${github.author} ${github.project} e3b68bdafb0d75db3225c3b91188d1b1032c448d
</span> version ${fstar.version}-[string range ${github.version} 0 6]
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3f96137351ba0ed2a9c1ca958b2b876ae1de5416 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6d9c1f0c274d2b441b345576f9f354043bd1007a93e0e3551142de392f0bcdba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7775119
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 22d7f2f4c89509e519484fd091798546ea7cb96a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0783cb5527c74d40286082511e80d8f563aab96b9d5dec98e3a11d7a104de566 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8010713
</span> github.tarball_from tarball
patchfiles-append fstar-devel/patch-tests_machine__integers_Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ocaml-sedlex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-ppxlib
</span> }
subport kremlin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,16 +245,15 @@ subport kremlin {
</span> }
subport kremlin-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup ${github.author} ${fstar.project} 18a6351f033ead59faa9c70d4cafa8be76c43adb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${fstar.version}-[string range ${github.version} 0 6]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ${github.author} ${fstar.project} 6e60e33aac1551c1ae20e4e02cb66a188935990b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210322-[string range ${github.version} 0 6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ec2932944a1a875a84195ab125b5a5084af882ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe29545aac1548a428e894fbe19c18ac2e7f68dfe44b01d6a05666fbc0ba99f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 892722
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 84737f24e0ad98da156cf831e7b8d2053225fa26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5623af7134c23cf3727884b2e2f2545f0e1d9dded5ceb48e2dacf4aa6f6b2bfe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 894544
</span>
patchfiles-append kremlin-devel/patch-clang-driver-options \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kremlin-devel/patch-fix-make-command \
</span> kremlin-devel/patch-fstar-discover-path \
kremlin-devel/patch-fstar-driver-no-lax \
kremlin-devel/patch-test_system_system.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,9 +266,6 @@ subport kremlin-devel {
</span> if {${fstar.project} eq "fstar"} {
ocaml.package_dir ${fstar.home}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args PREFIX=${fstar.home}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target ocaml-fstar-ocaml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.env KREMLIN_HOME=${kremlin.home}/home
test.dir ${worksrcpath}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -277,21 +292,8 @@ if {${fstar.project} eq "fstar"} {
</span> # - typeclasses
#
depends_test port:${kremlin.port}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.dir ${worksrcpath}/src/ocaml-output
</span> destroot.args PREFIX=${destroot}${fstar.home}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {dir ftargets} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src {ocaml-fstar-ocaml}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ulib {install-fstarlib install-fstar-tactics all}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.dir ${worksrcpath}/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target {*}${ftargets}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
# Remove intermediate build directories
foreach dir {ml tactics_ml} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/kremlin-devel/patch-fix-make-command b/lang/fstar/files/kremlin-devel/patch-fix-make-command
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 335113d2719..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/files/kremlin-devel/patch-fix-make-command
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2019-09-13 13:05:28.664142000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2019-09-13 13:05:48.070466000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,18 +42,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf krml _build Kremlin.$(FLAVOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- make -C test clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- make -C kremlib clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) -C test clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) -C kremlib clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- +make -C test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ +$(MAKE) -C test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Auto-detection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @which fstar.exe >/dev/null 2>&1 || [ -x $(FSTAR_HOME)/bin/fstar.exe ] || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "Didn't find fstar.exe in the path or in FSTAR_HOME (which is: $(FSTAR_HOME))"; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @ocamlfind query fstarlib >/dev/null 2>&1 || [ -f $(FSTAR_HOME)/bin/fstarlib/fstarlib.cmxa ] || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { echo "Didn't find fstarlib via ocamlfind or in FSTAR_HOME (which is: $(FSTAR_HOME)); run make -C $(FSTAR_HOME)/ulib/ml"; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { echo "Didn't find fstarlib via ocamlfind or in FSTAR_HOME (which is: $(FSTAR_HOME)); run $(MAKE) -C $(FSTAR_HOME)/ulib/ml"; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ x"$(PREFIX)" = x ]; then echo "please define PREFIX"; exit 1; fi
</span></pre><pre style='margin:0'>
</pre>