<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/2a956eadd50ff9fe251cdb5f50331180e0904e44">https://github.com/macports/macports-ports/commit/2a956eadd50ff9fe251cdb5f50331180e0904e44</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2a956eadd50ff9fe251cdb5f50331180e0904e44
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Wed Oct 2 16:56:29 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> fstar: use installation-relative path when locating z3
</span>---
lang/fstar/Portfile | 13 ++++++++++---
lang/fstar/files/patch-z3-path | 2 +-
lang/fstar/files/patch-z3-path-generated-ml | 11 +++++++++++
lang/fstar/files/patch-z3-path-generated-ml-devel | 11 +++++++++++
4 files changed, 33 insertions(+), 4 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 8d3c881..7ae6c33 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;'>@@ -73,7 +73,7 @@ foreach key {home doc_dirs bin port select_name} {
</span> # Common fstar/fstar-devel configuration
if {${fstar.project} eq "fstar"} {
github.project FStar
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> license MIT
description General-purpose functional language aimed at program verification
long_description F* (pronounced F star) is a general-purpose \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,12 +87,16 @@ if {${fstar.project} eq "fstar"} {
</span>
patchfiles patch-z3-path \
patch-examples-fix-tests \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-get_exec_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-get_exec_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "patch-z3-path-generated-ml${fstar.port_suffix}"
</span>
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Provide required link to z3 binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -shf ${prefix}/libexec/z3-fstar/bin/z3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/bin/z3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Fix-up paths to MacPorts' binaries
reinplace -E "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/basic/FStar.Options.fs \
</span> src/basic/ml/FStar_Util.ml
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,6 +280,9 @@ if {${fstar.project} eq "fstar"} {
</span>
# Provide an fstar.exe -> fstar compatibility symlink
ln -shf fstar ${destroot}${fstar.home}/bin/${fstar.bin}.exe
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Provide a link to our z3 binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -shf ../../z3-fstar/bin/z3 ${destroot}${fstar.home}/bin/z3
</span> }
# Apply shared kremlin/kremlin-devel subport configuration
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-z3-path b/lang/fstar/files/patch-z3-path
</span><span style='display:block; white-space:pre;color:#808080;'>index d28f8254..9d05316 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/files/patch-z3-path
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/patch-z3-path
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> let warn_default_effects () = get_warn_default_effects ()
let z3_exe () = match get_smt () with
- | None -> Platform.exe "z3"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | None -> Platform.exe "@PREFIX@/libexec/z3-fstar/bin/z3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | None -> Platform.exe (fstar_bin_directory ^ "/z3")
</span> | Some s -> s
let z3_cliopt () = get_z3cliopt ()
let z3_refresh () = get_z3refresh ()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-z3-path-generated-ml b/lang/fstar/files/patch-z3-path-generated-ml
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1be14d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/patch-z3-path-generated-ml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ocaml-output/FStar_Options.ml.orig 2019-10-02 15:54:03.893501000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ocaml-output/FStar_Options.ml 2019-10-02 15:55:31.328422000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1925,7 +1925,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fun uu____9547 ->
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let uu____9548 = get_smt () in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match uu____9548 with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | FStar_Pervasives_Native.None -> FStar_Platform.exe "z3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | FStar_Pervasives_Native.None -> FStar_String.op_Hat fstar_bin_directory (FStar_Platform.exe "/z3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | FStar_Pervasives_Native.Some s -> s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let (z3_cliopt : unit -> Prims.string Prims.list) =
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-z3-path-generated-ml-devel b/lang/fstar/files/patch-z3-path-generated-ml-devel
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c015e74
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/patch-z3-path-generated-ml-devel
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ocaml-output/FStar_Options.ml.orig 2019-09-25 00:19:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ocaml-output/FStar_Options.ml 2019-10-02 15:58:21.359369000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1943,7 +1943,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fun uu____9640 ->
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let uu____9641 = get_smt () in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match uu____9641 with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | FStar_Pervasives_Native.None -> FStar_Platform.exe "z3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | FStar_Pervasives_Native.None -> FStar_String.op_Hat fstar_bin_directory (FStar_Platform.exe "/z3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | FStar_Pervasives_Native.Some s -> s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let (z3_cliopt : unit -> Prims.string Prims.list) =
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>