<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/7a2ed7cc600998e3663116d613c79f06ef722933">https://github.com/macports/macports-ports/commit/7a2ed7cc600998e3663116d613c79f06ef722933</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7a2ed7cc600998e3663116d613c79f06ef722933
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Tue Aug 24 12:19:32 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> (fstar|kremlin)-devel: update to (20210824-b95d1ac|20210709-8d03c65)
</span>---
lang/fstar/Portfile | 55 +++++++++++++---------
.../files/{ => fstar-devel}/patch-fix-get_exec_dir | 6 +--
.../{ => fstar-stable}/patch-fix-get_exec_dir | 0
.../kremlin-devel/patch-kremlib-mach_absolute_time | 44 -----------------
4 files changed, 36 insertions(+), 69 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 434efab1fc5..4d1006c2cc7 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 20210511
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fstar.version 20210824
</span> fstar.release devel
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,8 +88,7 @@ if {${fstar.project} eq "fstar"} {
</span> be extracted to efficient OCaml, F#, C, WASM, or ASM \
code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-z3-path \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-get_exec_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-z3-path
</span>
post-patch {
# Fix up the z3 path in the generated code, too.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,10 +101,6 @@ if {${fstar.project} eq "fstar"} {
</span> # Provide required link to z3 binary
ln -shf ${prefix}/libexec/z3-fstar/bin/z3 \
${worksrcpath}/bin/z3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix-up paths to MacPorts' binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/basic/ml/FStar_Util.ml
</span> }
# destroot requires ginstall from coreutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,13 +165,20 @@ subport fstar {
</span> size 7173479
patchfiles-append fstar-stable/patch-ocaml4.08 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fstar-stable/patch-examples-fix-tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fstar-stable/patch-examples-fix-tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fstar-stable/patch-fix-get_exec_dir
</span>
depends_lib-append port:ocaml-ulex \
port:ocaml-migrate-parsetree
build.args PREFIX=${fstar.home}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix-up paths to MacPorts' binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/basic/ml/FStar_Util.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {
foreach {dir ftargets} {
src {ocaml-fstar-ocaml}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,19 +194,27 @@ subport fstar {
</span> }
subport fstar-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup ${github.author} ${github.project} bcb002a0dc32da605ceda7932de4c6cc2a20b971
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ${github.author} ${github.project} b95d1ac83a18945266d3401acc0dcb3ce438108b
</span> version ${fstar.version}-[string range ${github.version} 0 6]
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b4e10f3d1269c2ee25b6b0989a725818457eebdb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d37bd8323e2c5a2bf2a639fa679438cca35ec591c52e1ac8cfa2c05db04788df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8068341
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5a9425b3267e68dd3151e43d737e29f0cd492992 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8c47e48d3b4ee97d2f0c672205af754087eca5d70be7776bbc7a81b58a318b8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8168870
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append fstar-devel/patch-tests_machine__integers_Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append fstar-devel/patch-fix-get_exec_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fstar-devel/patch-tests_machine__integers_Makefile
</span>
depends_lib-append port:ocaml-sedlex \
port:ocaml-ppxlib
<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;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix-up paths to MacPorts' binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/basic/ml/FStar_Compiler_Util.ml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport kremlin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,19 +255,19 @@ subport kremlin {
</span> }
subport kremlin-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup ${github.author} ${fstar.project} 5a8c41548147e548b258cefa755064a48cb31b39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20210510-[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} 8d03c65f95fbc79b4f1fcfab1dc4c8f4f985d6d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210709-[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 7e7ffb011ae41c8dd55ac2a00220b08aa2b15986 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5db9af845067b58d772f47b9b24410d221cdd5b702c4153c621400f0caeec0c7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 894013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ae7b00b1c118ac9abed39ffcc2ef41427a61f630 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af26f369566fdcb0154f533dcd01d48c08bedb65551c04ce16fdf42dc3c41562 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 895674
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span>
patchfiles-append kremlin-devel/patch-clang-driver-options \
kremlin-devel/patch-fstar-discover-path \
kremlin-devel/patch-fstar-driver-no-lax \
kremlin-devel/patch-kremlib-march-native \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kremlin-devel/patch-kremlib-mach_absolute_time \
</span> kremlin-devel/patch-test_system_system.h
depends_lib-append port:ocaml-sedlex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +279,8 @@ if {${fstar.project} eq "fstar"} {
</span> ocaml.package_dir ${fstar.home}/bin
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env KREMLIN_HOME=${kremlin.home}/home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env FSTAR_HOME=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KREMLIN_HOME=${kremlin.home}/home
</span> test.dir ${worksrcpath}
test.target all
test.args -C examples \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-fix-get_exec_dir b/lang/fstar/files/fstar-devel/patch-fix-get_exec_dir
</span>similarity index 73%
copy from lang/fstar/files/patch-fix-get_exec_dir
copy to lang/fstar/files/fstar-devel/patch-fix-get_exec_dir
<span style='display:block; white-space:pre;color:#808080;'>index 276b1583bf7..78191bd2973 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/files/patch-fix-get_exec_dir
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/fstar-devel/patch-fix-get_exec_dir
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/basic/ml/FStar_Util.ml.orig 2019-09-19 13:38:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/basic/ml/FStar_Util.ml 2019-09-19 13:38:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -841,7 +841,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/basic/ml/FStar_Compiler_Util.ml.orig 2021-08-24 00:25:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/basic/ml/FStar_Compiler_Util.ml 2021-08-24 11:17:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -853,7 +853,10 @@
</span> let decr r = FStar_ST.(Z.(write r (read r - one)))
let geq (i:int) (j:int) = i >= j
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-fix-get_exec_dir b/lang/fstar/files/fstar-stable/patch-fix-get_exec_dir
</span>similarity index 100%
rename from lang/fstar/files/patch-fix-get_exec_dir
rename to lang/fstar/files/fstar-stable/patch-fix-get_exec_dir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/kremlin-devel/patch-kremlib-mach_absolute_time b/lang/fstar/files/kremlin-devel/patch-kremlib-mach_absolute_time
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b549385b65..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/files/kremlin-devel/patch-kremlib-mach_absolute_time
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kremlib/c/testlib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kremlib/c/testlib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,25 +3,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "TestLib.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TestLib_cycles TestLib_cpucycles(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return mach_absolute_time();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned hi, lo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ((unsigned long long)lo) | (((unsigned long long)hi) << 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- TestLib_cycles TestLib_cpucycles_begin(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return mach_absolute_time();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned hi, lo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ __volatile__ ("CPUID\n\t" "RDTSC\n\t" "mov %%edx, %0\n\t" "mov %%eax, %1\n\t": "=r" (hi), "=r" (lo):: "%rax", "%rbx", "%rcx", "%rdx");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ( (uint64_t)lo)|( ((uint64_t)hi)<<32 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- TestLib_cycles TestLib_cpucycles_end(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return mach_absolute_time();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned hi, lo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __asm__ __volatile__ ("RDTSCP\n\t" "mov %%edx, %0\n\t" "mov %%eax, %1\n\t" "CPUID\n\t": "=r" (hi), "=r" (lo):: "%rax", "%rbx", "%rcx", "%rdx");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ( (uint64_t)lo)|( ((uint64_t)hi)<<32 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>