Skip to content

Update llvm and z3 #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 30, 2022
Merged

Update llvm and z3 #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04273f
Update Z3 to 4.8.16
ekilmer Apr 27, 2022
f0944e9
Update LLVM 14.0.2
ekilmer Apr 27, 2022
24092c6
Update LLVM to 14.0.3
ekilmer Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/llvm-14/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
set(LLVM_VERSION "14.0.1")
set(LLVM_VERSION "14.0.3")

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO llvm/llvm-project
REF llvmorg-${LLVM_VERSION}
SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
HEAD_REF master
PATCHES
0001-fix-install-tools-path.patch
Expand Down
3 changes: 1 addition & 2 deletions ports/llvm-14/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "llvm-14",
"version": "14.0.1",
"port-version": 0,
"version": "14.0.3",
"description": "The LLVM Compiler Infrastructure.",
"homepage": "https://llvm.org",
"supports": "!uwp & !(arm & windows)",
Expand Down
132 changes: 0 additions & 132 deletions ports/z3/fix-32-bit-build.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ports/z3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Z3Prover/z3
REF z3-4.8.15
SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c
REF z3-4.8.16
SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615
HEAD_REF master
PATCHES
fix-install-path.patch
remove-flag-overrides.patch
fix-32-bit-build.patch
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand Down
2 changes: 1 addition & 1 deletion ports/z3/remove-flag-overrides.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ index 477410ba8..fcca03917 100644
cmake_minimum_required(VERSION 3.4)

-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake")
project(Z3 VERSION 4.8.15.0 LANGUAGES CXX)
project(Z3 VERSION 4.8.16.0 LANGUAGES CXX)

################################################################################
3 changes: 1 addition & 2 deletions ports/z3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "z3",
"version": "4.8.15",
"port-version": 1,
"version": "4.8.16",
"description": "Z3 is a theorem prover from Microsoft Research",
"homepage": "https://github.com/Z3Prover/z3",
"license": "MIT",
Expand Down