Skip to content

Commit d77dd7b

Browse files
ekilmerekilmer
authored
Update ports (#1005)
* LLVM to 15.0.7 * z3 to 4.12.0 * vcpkg to latest 2023.01.09
1 parent 2adea3b commit d77dd7b

File tree

8 files changed

+99
-6
lines changed

8 files changed

+99
-6
lines changed

‎build_dependencies.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,18 @@ if [[ ${UPGRADE_PORTS} == "true" ]]; then
261261
) || exit 1
262262
fi
263263

264+
dep_file='@dependencies.txt'
265+
if [ ! -f "${repo_dir}/dependencies.txt" ] ; then
266+
dep_file=''
267+
fi
268+
264269
# Run the vcpkg installation of our packages
265270
(
266271
cd "${repo_dir}"
267272
(
268273
set -x
269274

270-
"${vcpkg_dir}/vcpkg" install "${extra_vcpkg_args[@]}" '@overlays.txt' '@dependencies.txt' "${VCPKG_ARGS[@]}"
275+
"${vcpkg_dir}/vcpkg" install "${extra_vcpkg_args[@]}" '@overlays.txt' "${dep_file}" "${VCPKG_ARGS[@]}"
271276
)
272277
) || exit 1
273278

‎ports/llvm-15/portfile.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
set(LLVM_VERSION "15.0.6")
1+
set(LLVM_VERSION "15.0.7")
22

33
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
44

55
vcpkg_from_github(
66
OUT_SOURCE_PATH SOURCE_PATH
77
REPO llvm/llvm-project
88
REF llvmorg-${LLVM_VERSION}
9-
SHA512 070944b322d8629986ec40d01c2c9bbd0da32c929b60133209e08c284346c8631a34d5b7833f71733aa3979f321f0f7450c42a35740340f414606a4e5849dbe3
9+
SHA512 99beff9ee6f8c26f16ea53f03ba6209a119099cbe361701b0d5f4df9d5cc5f2f0da7c994c899a4cec876da8428564dc7a8e798226a9ba8b5c18a3ef8b181d39e
1010
HEAD_REF release/15.x
1111
PATCHES
1212
0001-Fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc.

‎ports/llvm-15/vcpkg.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "llvm-15",
3-
"version": "15.0.6",
4-
"port-version": 4,
3+
"version": "15.0.7",
54
"description": "The LLVM Compiler Infrastructure.",
65
"homepage": "https://llvm.org",
76
"license": "Apache-2.0",

‎ports/z3/fix-install-path.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2+
index e8de0c7e4..064c18eab 100644
3+
--- a/src/CMakeLists.txt
4+
+++ b/src/CMakeLists.txt
5+
@@ -173,6 +173,7 @@ install(TARGETS libz3
6+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
7+
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed?
8+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake
9+
+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX.
10+
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
11+
)
12+
13+
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
14+
index 278246341..b6cd2f1c1 100644
15+
--- a/src/shell/CMakeLists.txt
16+
+++ b/src/shell/CMakeLists.txt
17+
@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS})
18+
z3_add_component_dependencies_to_target(shell ${shell_expanded_deps})
19+
z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
20+
install(TARGETS shell
21+
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
22+
+ RUNTIME DESTINATION tools/z3
23+
)

‎ports/z3/portfile.cmake‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
vcpkg_find_acquire_program(PYTHON3)
2+
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
3+
vcpkg_add_to_path("${PYTHON3_DIR}")
4+
5+
vcpkg_from_github(
6+
OUT_SOURCE_PATH SOURCE_PATH
7+
REPO Z3Prover/z3
8+
REF z3-4.12.0
9+
SHA512 53a51c8304fa4356d13293f68b14d9d9eef57a0771c6698d38aea5fac62c4e52c41ff003cb6d771a32645d2aa4ef59be5f792f2efbee927d06ac8280094976e5
10+
HEAD_REF master
11+
PATCHES
12+
fix-install-path.patch
13+
remove-flag-overrides.patch
14+
)
15+
16+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
17+
set(BUILD_STATIC "-DZ3_BUILD_LIBZ3_SHARED=OFF")
18+
endif()
19+
20+
vcpkg_cmake_configure(
21+
SOURCE_PATH ${SOURCE_PATH}
22+
OPTIONS
23+
${BUILD_STATIC}
24+
-DZ3_BUILD_TEST_EXECUTABLES=OFF
25+
-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
26+
)
27+
28+
vcpkg_cmake_install()
29+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/z3)
30+
vcpkg_copy_pdbs()
31+
32+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
33+
34+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
35+
36+
vcpkg_fixup_pkgconfig()

‎ports/z3/remove-flag-overrides.patch‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 477410ba8..fcca03917 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,7 +1,6 @@
6+
# Enforce some CMake policies
7+
cmake_minimum_required(VERSION 3.4)
8+
9+
-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake")
10+
project(Z3 VERSION 4.12.0.0 LANGUAGES CXX)
11+
12+
################################################################################

‎ports/z3/vcpkg.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "z3",
3+
"version": "4.12.0",
4+
"description": "Z3 is a theorem prover from Microsoft Research",
5+
"homepage": "https://github.com/Z3Prover/z3",
6+
"license": "MIT",
7+
"supports": "!uwp",
8+
"dependencies": [
9+
{
10+
"name": "vcpkg-cmake",
11+
"host": true
12+
},
13+
{
14+
"name": "vcpkg-cmake-config",
15+
"host": true
16+
}
17+
]
18+
}

‎vcpkg_info.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
https://github.com/microsoft/vcpkg.git
2-
2022.11.14
2+
2023.01.09

0 commit comments

Comments
 (0)