Skip to content
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.

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

[llvm] update to v14.0.3 [halide] update to v14.0.0 [mesa] update to 22.0.2 #23734

Merged
merged 29 commits into from
May 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e75a3ca
[llvm] update to v14.0.0
yurybura Mar 23, 2022
bebbf1e
[llvm] BOLT sub-project support
yurybura Apr 2, 2022
7849529
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Apr 9, 2022
519ab3a
[llvm] fix tools install paths
yurybura Apr 10, 2022
f840b0a
[halide] update to v14.0.0
yurybura Apr 10, 2022
09a95d4
update versions
yurybura Apr 10, 2022
ed4df5c
[vcpkg-get-python-packages] fix "LOGNAME should be specified" warning
yurybura Apr 13, 2022
873e340
[mesa] update to v22.0.1
yurybura Apr 13, 2022
1d91f1d
update versions
yurybura Apr 13, 2022
b9b6bae
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Apr 13, 2022
47dc7ec
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Apr 14, 2022
c2fd449
update versions
yurybura Apr 14, 2022
06f6689
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura Apr 22, 2022
88cfbe5
update version
yurybura Apr 22, 2022
f6f1154
[mesa] update to 22.0.2
yurybura Apr 25, 2022
e9ce065
update version
yurybura Apr 25, 2022
cdd09eb
[mesa] update patches
yurybura Apr 26, 2022
336d519
update version
yurybura Apr 26, 2022
1503fb0
[llvm] update to v14.0.3
yurybura Apr 30, 2022
95d4b51
update version
yurybura Apr 30, 2022
a05f93f
[llvm] remove depricated feature
yurybura May 2, 2022
7d8e1da
[llvm] allow to build OpenMP on Windows and remove incomplete cross-c…
yurybura May 2, 2022
5494fd2
update version
yurybura May 2, 2022
b67d1c3
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura May 9, 2022
e222cd6
[llvm] use vcpkg_cmake_get_vars
yurybura May 10, 2022
27a6e9d
[llvm/openmp] install CMake file in share/openmp
yurybura May 10, 2022
5e5df26
Merge branch 'master' of https://github.com/microsoft/vcpkg into llvm…
yurybura May 13, 2022
949de8a
[llvm] add vcpkg-cmake-get-vars dependency and slip post build check …
yurybura May 14, 2022
5e5847c
update version
yurybura May 14, 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
6 changes: 3 additions & 3 deletions ports/halide/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

set(HALIDE_VERSION_TAG v13.0.2)
set(HALIDE_VERSION_TAG v14.0.0)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO halide/Halide
REF ${HALIDE_VERSION_TAG}
SHA512 d2b19934ff0d759d302428f61e4075306f79c29cc1cd8802dc1ac5f325434034e0f430c435610e58f862b87cc8ef34ddcc3d0588947eeb8e1387d0bf31b9c008
HEAD_REF release/13.x
SHA512 c7b1186cca545f30d038f1e9bb28ca7231023869d191c50722213da4c7e9adfd4a53129fe395cd7938cb7cb3fb1bf80f9cd3b4b8473a0246f15b9ad8d3e40fe2
HEAD_REF release/14.x
)

vcpkg_check_features(
Expand Down
2 changes: 1 addition & 1 deletion ports/halide/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "halide",
"version": "13.0.2",
"version": "14.0.0",
"description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.",
"homepage": "https://github.com/halide/Halide",
"supports": "!uwp",
Expand Down
109 changes: 66 additions & 43 deletions ports/llvm/0002-fix-install-paths.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
clang/cmake/modules/CMakeLists.txt | 4 ++--
yurybura marked this conversation as resolved.
Show resolved Hide resolved
flang/cmake/modules/CMakeLists.txt | 4 ++--
lld/cmake/modules/CMakeLists.txt | 4 ++--
llvm/cmake/modules/AddLLVM.cmake | 2 +-
llvm/cmake/modules/CMakeLists.txt | 2 +-
mlir/cmake/modules/CMakeLists.txt | 4 ++--
polly/cmake/CMakeLists.txt | 4 ++--
pstl/CMakeLists.txt | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
clang/cmake/modules/CMakeLists.txt | 4 ++--
compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +-
flang/cmake/modules/CMakeLists.txt | 4 ++--
lld/cmake/modules/CMakeLists.txt | 4 ++--
llvm/cmake/modules/AddLLVM.cmake | 2 +-
llvm/cmake/modules/CMakeLists.txt | 2 +-
mlir/cmake/modules/CMakeLists.txt | 4 ++--
mlir/test/CMakeLists.txt | 2 +-
openmp/tools/Modules/CMakeLists.txt | 2 +-
polly/cmake/CMakeLists.txt | 4 ++--
10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt
index 561665d58cad..3c73878a4483 100644
index c6f6ce9fe5d6..fc886b23a1a8 100644
--- a/clang/cmake/modules/CMakeLists.txt
+++ b/clang/cmake/modules/CMakeLists.txt
@@ -3,11 +3,11 @@ include(LLVMDistributionSupport)
@@ -5,11 +5,11 @@ include(FindPrefixFromConfig)
# Generate a list of CMake library targets so that other CMake projects can
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
# the usual CMake convention seems to be ${Project}Targets.cmake.
Expand All @@ -26,11 +28,24 @@ index 561665d58cad..3c73878a4483 100644
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")

get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
index 052095801aae..f3402793b60c 100644
--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -376,7 +376,7 @@ macro(load_llvm_config)
file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR)
else()
file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE)
- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
+ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm")
endif()

set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake")
diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt
index e46498a6bc35..2e922f8ca89d 100644
index 170568c80dde..1bf6d6a829e2 100644
--- a/flang/cmake/modules/CMakeLists.txt
+++ b/flang/cmake/modules/CMakeLists.txt
@@ -1,11 +1,11 @@
@@ -4,11 +4,11 @@ include(FindPrefixFromConfig)
# Generate a list of CMake library targets so that other CMake projects can
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
# the usual CMake convention seems to be ${Project}Targets.cmake.
Expand All @@ -45,10 +60,10 @@ index e46498a6bc35..2e922f8ca89d 100644

get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS)
diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt
index 62d03fa901dd..09b0f54ee8c3 100644
index 760c9d5f8d87..acd8a65808f5 100644
--- a/lld/cmake/modules/CMakeLists.txt
+++ b/lld/cmake/modules/CMakeLists.txt
@@ -1,11 +1,11 @@
@@ -4,11 +4,11 @@ include(FindPrefixFromConfig)
# Generate a list of CMake library targets so that other CMake projects can
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
# the usual CMake convention seems to be ${Project}Targets.cmake.
Expand All @@ -63,10 +78,10 @@ index 62d03fa901dd..09b0f54ee8c3 100644

get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS)
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index 29e40f45fef8..e9094e9b8eb2 100644
index 37bc98f9e021..7cbfa2a9a577 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -1033,7 +1033,7 @@ function(process_llvm_pass_plugins)
@@ -1049,7 +1049,7 @@ function(process_llvm_pass_plugins)

## Part 1: Extension header to be included whenever we need extension
# processing.
Expand All @@ -76,22 +91,23 @@ index 29e40f45fef8..e9094e9b8eb2 100644
file(WRITE
"${llvm_cmake_builddir}/LLVMConfigExtensions.cmake"
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
index 51b6a4fdc284..a818de2e116c 100644
index cea0c1df0a14..639c5422b04a 100644
--- a/llvm/cmake/modules/CMakeLists.txt
+++ b/llvm/cmake/modules/CMakeLists.txt
@@ -1,6 +1,6 @@
@@ -2,7 +2,7 @@ include(ExtendPath)
include(LLVMDistributionSupport)
include(FindPrefixFromConfig)

-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")

# First for users who use an installed LLVM, create the LLVMExports.cmake file.
diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt
index 65efc4a14987..7c3213ab0c2b 100644
index d6703993bd74..e2f6cd3ea8cb 100644
--- a/mlir/cmake/modules/CMakeLists.txt
+++ b/mlir/cmake/modules/CMakeLists.txt
@@ -3,11 +3,11 @@ include(LLVMDistributionSupport)
@@ -5,11 +5,11 @@ include(FindPrefixFromConfig)
# Generate a list of CMake library targets so that other CMake projects can
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
# the usual CMake convention seems to be ${Project}Targets.cmake.
Expand All @@ -105,34 +121,41 @@ index 65efc4a14987..7c3213ab0c2b 100644
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")

get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS)
diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
index 8e44a9c37cf1..f6edc7d77ffd 100644
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
# Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test
# can find MLIR's CMake configuration
set(MLIR_CMAKE_DIR
- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir")
+ "${CMAKE_BINARY_DIR}/share/mlir")

# Passed to lit.site.cfg.py.in to set up the path where to find the libraries
# for linalg integration tests.
diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt
index 22d818eea72d..75aacc4468d4 100644
--- a/openmp/tools/Modules/CMakeLists.txt
+++ b/openmp/tools/Modules/CMakeLists.txt
@@ -12,4 +12,4 @@


install(FILES "FindOpenMPTarget.cmake"
- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
+ DESTINATION "share/openmp")
diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt
index 7cc129ba2e90..9776391cd535 100644
index 7a0190b69df6..cdd3b4f126bb 100644
--- a/polly/cmake/CMakeLists.txt
+++ b/polly/cmake/CMakeLists.txt
@@ -1,7 +1,7 @@
# Keep this in sync with llvm/cmake/CMakeLists.txt!
@@ -3,8 +3,8 @@
include(ExtendPath)
include(FindPrefixFromConfig)

-set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
-set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly")
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
+set(POLLY_INSTALL_PACKAGE_DIR share/polly)
+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm")
+set(POLLY_INSTALL_PACKAGE_DIR "share/polly")
if (CMAKE_CONFIGURATION_TYPES)
set(POLLY_EXPORTS_FILE_NAME "PollyExports-$<LOWER_CASE:$<CONFIG>>.cmake")
else()
diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt
index 8bea8843589b..3658c0a4414a 100644
--- a/pstl/CMakeLists.txt
+++ b/pstl/CMakeLists.txt
@@ -81,10 +81,10 @@ install(TARGETS ParallelSTL
install(EXPORT ParallelSTLTargets
FILE ParallelSTLTargets.cmake
NAMESPACE pstl::
- DESTINATION lib/cmake/ParallelSTL)
+ DESTINATION share/ParallelSTL)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake"
- DESTINATION lib/cmake/ParallelSTL)
+ DESTINATION share/ParallelSTL)
install(DIRECTORY include/
DESTINATION include
PATTERN "*.in" EXCLUDE)
25 changes: 0 additions & 25 deletions ports/llvm/0003-fix-openmp-debug.patch

This file was deleted.

2 changes: 1 addition & 1 deletion ports/llvm/0005-fix-tools-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
yurybura marked this conversation as resolved.
Show resolved Hide resolved
index 1a2f04552d13..9370c5e28206 100644
index 8ed88f33ead4..3f2d1b98adcc 100644
--- a/llvm/tools/llvm-config/llvm-config.cpp
+++ b/llvm/tools/llvm-config/llvm-config.cpp
@@ -305,7 +305,7 @@ int main(int argc, char **argv) {
Expand Down
12 changes: 6 additions & 6 deletions ports/llvm/0007-fix-compiler-rt-install-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
index 8131f6005dc2..9afef2e5a4e7 100644
index 078988980c52..795f495b32d6 100644
--- a/clang/lib/Headers/CMakeLists.txt
+++ b/clang/lib/Headers/CMakeLists.txt
@@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES
@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES
FOLDER "Misc"
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")

Expand All @@ -17,10 +17,10 @@ index 8131f6005dc2..9afef2e5a4e7 100644
install(
FILES ${files} ${generated_files}
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt
index 61b1c60bf590..c20a5a326f15 100644
index ca7e17927ee1..87d4282b36ad 100644
--- a/clang/runtime/CMakeLists.txt
+++ b/clang/runtime/CMakeLists.txt
@@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
-DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
-DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
Expand All @@ -30,10 +30,10 @@ index 61b1c60bf590..c20a5a326f15 100644
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
index c11342e68813..61bb52135c43 100644
index d7b0124f3546..55e515cb1c7a 100644
--- a/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@ -42,7 +42,7 @@ if (LLVM_TREE_AVAILABLE)
@@ -44,7 +44,7 @@ if (LLVM_TREE_AVAILABLE)
# Setup the paths where compiler-rt runtimes and headers should be stored.
set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
Expand Down
Loading