<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/0411bea85ba6a80e2e3877dfe0708774b4939455">https://github.com/macports/macports-ports/commit/0411bea85ba6a80e2e3877dfe0708774b4939455</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0411bea85ba z3: update to 4.8.9
</span>0411bea85ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0411bea85ba6a80e2e3877dfe0708774b4939455
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Thu Nov 5 09:51:07 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> z3: update to 4.8.9
</span>---
math/z3/Portfile | 15 +++++++++------
math/z3/files/java_libpath.diff | 19 +++++++++++--------
.../{libz3-static.diff => libz3-static-4.8.5.diff} | 0
math/z3/files/libz3-static.diff | 20 ++++++++++----------
4 files changed, 30 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/z3/Portfile b/math/z3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 642d5eb2a1b..c5ab6340de6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/z3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/z3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,10 @@ if {${subport} eq "${name}-fstar"} {
</span> sha256 4e8e232887ddfa643adb6a30dcd3743cb2fa6591735fbd302b49f7028cdc0363 \
size 4177051
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup Z3Prover z3 4.8.8 z3-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a98d4a9cb524cef67bcce91be7ba830b00f8078d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6962facdcdea287c5eeb1583debe33ee23043144d0e5308344e6a8ee4503bcff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4520119
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup Z3Prover z3 4.8.9 z3-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 994538ce2a5ea09bd2a6636b782a0b3de18ab577 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9fd04b9b33be74fffaac3ec2bc2c320d1a4cc32e395203c55126b12a14ff3f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4624159
</span> }
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +31,11 @@ license MIT
</span>
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles libz3-static.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${version} "4.8.9"] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles libz3-static.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles libz3-static-4.8.5.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
worksrcdir ${name}-${github.tag_prefix}${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/z3/files/java_libpath.diff b/math/z3/files/java_libpath.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1728be1a1e..7135f6ce47b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/z3/files/java_libpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/z3/files/java_libpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/update_api.py.orig 2019-08-20 22:29:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/update_api.py 2019-08-20 22:30:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -519,8 +519,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java_native.write(' public static native void setInternalErrorHandler(long ctx);\n\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/update_api.py 2020-09-10 12:51:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/update_api.py 2020-11-05 09:46:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -543,11 +543,7 @@
</span>
java_native.write(' static {\n')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- java_native.write(' try { System.loadLibrary("z3java"); }\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- java_native.write(' catch (UnsatisfiedLinkError ex) { System.loadLibrary("libz3java"); }\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ java_native.write(' System.load("@PREFIX@/lib/z3/libz3java.dylib");\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java_native.write(' if (null == System.getProperty("z3.skipLibraryLoad")) {\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- java_native.write(' try {\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- java_native.write(' System.loadLibrary("z3java");\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- java_native.write(' } catch (UnsatisfiedLinkError ex) {\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- java_native.write(' System.loadLibrary("libz3java");\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- java_native.write(' }\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ java_native.write(' System.load("@PREFIX@/lib/z3/libz3java.dylib");\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java_native.write(' }\n')
</span> java_native.write(' }\n')
<span style='display:block; white-space:pre;background:#ffe0e0;'>- java_native.write('\n')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/z3/files/libz3-static.diff b/math/z3/files/libz3-static-4.8.5.diff
</span>similarity index 100%
copy from math/z3/files/libz3-static.diff
copy to math/z3/files/libz3-static-4.8.5.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/z3/files/libz3-static.diff b/math/z3/files/libz3-static.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 504b09e8f21..2b01f3de58a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/z3/files/libz3-static.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/z3/files/libz3-static.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt.orig 2019-08-20 17:53:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt 2019-08-20 18:01:51.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,6 +111,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2020-09-10 12:51:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2020-11-04 20:46:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,6 +113,7 @@
</span> set(lib_type "STATIC")
endif()
add_library(libz3 ${lib_type} ${object_files})
+add_library(libz3-static STATIC ${object_files})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(libz3 PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # VERSION determines the version in the filename of the shared library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SOVERSION determines the value of the DT_SONAME field on ELF platforms.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,6 +123,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(libz3 INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,6 +128,11 @@
</span> VERSION ${Z3_VERSION}
SOVERSION ${Z3_VERSION_MAJOR}.${Z3_VERSION_MINOR})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> if (NOT MSVC)
# On UNIX like platforms if we don't change the OUTPUT_NAME
# the library gets a name like ``liblibz3.so`` so we change it
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,6 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,6 +147,7 @@
</span> # shared library the dependent libraries are specified on the link command line
# so that if those are also shared libraries they are referenced by `libz3.so`.
target_link_libraries(libz3 PRIVATE ${Z3_DEPENDENT_LIBS})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@
</span>
# This is currently only for the OpenMP flags. It needs to be set
# via `target_link_libraries()` rather than `z3_append_linker_flag_list_to_target()`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,6 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,6 +155,7 @@
</span> # the link dependencies need to be exported too.
foreach (flag_name ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
target_link_libraries(libz3 PRIVATE ${flag_name})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> endforeach()
# Declare which header file are the public header files of libz3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -169,7 +177,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +182,7 @@
</span> set_property(TARGET libz3 APPEND PROPERTY
PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/util/z3_version.h")
</pre><pre style='margin:0'>
</pre>