From 4c486ab7fb7014e4a08b0793d9cf62d71f3cd310 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 14 Dec 2023 00:05:06 +0700 Subject: [PATCH] [z3] Update to 4.12.4. --- ports/z3/fix-cstdint-include.patch | 12 ------------ ports/z3/portfile.cmake | 5 ++--- ports/z3/remove-flag-overrides.patch | 4 ++-- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 6 +++++- 6 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 ports/z3/fix-cstdint-include.patch diff --git a/ports/z3/fix-cstdint-include.patch b/ports/z3/fix-cstdint-include.patch deleted file mode 100644 index fe3a1fcdba5112..00000000000000 --- a/ports/z3/fix-cstdint-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/util/tptr.h b/src/util/tptr.h -index 6213b2efa..2a35af535 100644 ---- a/src/util/tptr.h -+++ b/src/util/tptr.h -@@ -20,6 +20,7 @@ Revision History: - #pragma once - - #include "util/machine.h" -+#include - - #define TAG_SHIFT PTR_ALIGNMENT - #define ALIGNMENT_VALUE (1 << PTR_ALIGNMENT) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 5a8ca23df302c8..82ee908682484c 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,12 +5,11 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.12.2 - SHA512 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2 + REF z3-${VERSION} + SHA512 fcb778d2e3e0d13fc68afcd8724548279f9edbbb4aac1bbb93e00959c33330ab2fd84f2c2e4b0b78f767819725a90b845fc606a9adc931ae1f0a11f4deae433b HEAD_REF master PATCHES fix-install-path.patch - fix-cstdint-include.patch remove-flag-overrides.patch ) diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index d50e6120ffc621..d872612d80da45 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -4,9 +4,9 @@ index 477410ba8..fcca03917 100644 +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ # Enforce some CMake policies - cmake_minimum_required(VERSION 3.4) + cmake_minimum_required(VERSION 3.16) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.12.2.0 LANGUAGES CXX) + project(Z3 VERSION 4.12.4.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 7f44e4c51e0c8c..9cb897f98baa83 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.12.2", + "version": "4.12.4", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7ceb21b822fdc7..6ebf00a63a678e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9329,7 +9329,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.12.2", + "baseline": "4.12.4", "port-version": 0 }, "z4kn4fein-semver": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 504c2034a897aa..94a4e9a6bf8f2d 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,11 +1,15 @@ { "versions": [ + { + "git-tree": "98aa7c18e339247b197bab014d1a52310ba39a7a", + "version": "4.12.4", + "port-version": 0 + }, { "git-tree": "dcef04d626f19434eaf9d2a3afb43d927bbd372e", "version": "4.12.2", "port-version": 0 }, - { "git-tree": "4c57981e593026824fe9bedff234a82c13765e29", "version": "4.11.0",