Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1eca547
[llvm] update to 12.0.0, enable zlib and libxml2
yurybura Mar 20, 2021
1b29ec3
[llvm] disable libxml2 by default, arm64-windows should be supported
yurybura Apr 17, 2021
9a0f64a
[llvm] try to fix build with ffi on Windows #17663
yurybura May 6, 2021
6b8d722
Merge branch 'master' of https://github.com/microsoft/vcpkg
yurybura May 6, 2021
891c0b8
[llvm] re-enable libxml2
yurybura May 13, 2021
daf3071
[llvm] fix formatting
yurybura May 13, 2021
60ccd56
[llvm] overwrite version
yurybura May 13, 2021
1d1d517
[mesa] update to v21.1.0
yurybura May 13, 2021
18276d0
[llvm] update ci.baseline
yurybura May 13, 2021
54206c4
[halide] update to the latest master commit
yurybura May 15, 2021
ad31ff8
[llvm] disable libxml2 port until complete PR #15390
yurybura May 15, 2021
1a7d3bb
update versions
yurybura May 15, 2021
9ce3307
[llvm] fix disabling of external libraries
yurybura May 15, 2021
8acba45
update version
yurybura May 15, 2021
cecbc8b
update ci.baseline
yurybura May 15, 2021
9a614c4
update ci.baseline
yurybura May 15, 2021
4ec713a
fix typo
yurybura May 17, 2021
f19402d
[llvm] fix libxml2 (depends on #17945)
yurybura May 18, 2021
1395b7c
Merge branch 'master' of https://github.com/microsoft/vcpkg
yurybura May 18, 2021
9eaadef
revert "[halide] update to the latest master commit"
yurybura May 18, 2021
6ce9238
update versions
yurybura May 18, 2021
ea7294c
[halide] fix zlib dependency for tools
yurybura May 19, 2021
7354be4
update versions
yurybura May 19, 2021
9fe3f33
[halide] update to official release v12.0.0
yurybura May 20, 2021
2962fd7
update versions
yurybura May 20, 2021
e996afb
Merge branch 'master' of https://github.com/microsoft/vcpkg
yurybura May 20, 2021
fe28200
[halide] update to v12.0.1
yurybura May 21, 2021
aa9139a
update version
yurybura May 21, 2021
1a0414c
Merge branch 'master' of https://github.com/microsoft/vcpkg
yurybura May 21, 2021
2434aac
[mesa] remove llvm from defaults
yurybura May 27, 2021
aef20c1
update version
yurybura May 27, 2021
0dc80ce
Merge branch 'master' of https://github.com/microsoft/vcpkg
yurybura May 27, 2021
09e62f2
update ci.baseline
yurybura May 27, 2021
1a6e190
[mesa] update to v21.1.2 and fix build with LLVM on Windows
yurybura Jun 6, 2021
135a7cf
[llvm] allow to build libunwind project on Windows
yurybura Jun 6, 2021
3aa42e9
update versions
yurybura Jun 6, 2021
dfd76b0
[mesa] update ci.baseline.txt to disable x64-windows-static-md, may b…
yurybura Jun 17, 2021
617023c
Merge branch 'master' of https://github.com/microsoft/vcpkg
yurybura Jun 17, 2021
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
64 changes: 0 additions & 64 deletions ports/halide/CONTROL

This file was deleted.

38 changes: 20 additions & 18 deletions ports/halide/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,27 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO halide/Halide
REF 85c1b91c47ce15aab0d9502d955e48615f3bcee0 # v11.0.1
SHA512 3bfdf9fc82d56d099cf74b6683c0017724c1c4ae791e824f5ef3b4d4c1dcb52dd5adddb740ccf6b073b71fcbb748238f42040071ddb64c155f8fdc2709b8121d
HEAD_REF release/11.x
REF 5dabcaa9effca1067f907f6c8ea212f3d2b1d99a # v12.0.1
SHA512 5ab44703850885561337e23d8b538a5adfe1611e24e8daa4a1313756b4f9dfeb54e89bf8400d46a3340c00234402681b4f44ba3ed5322027fd6cb5dfbd525acd
HEAD_REF release/12.x
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
target-aarch64 TARGET_AARCH64
target-amdgpu TARGET_AMDGPU
target-arm TARGET_ARM
target-d3d12compute TARGET_D3D12COMPUTE
target-hexagon TARGET_HEXAGON
target-metal TARGET_METAL
target-mips TARGET_MIPS
target-nvptx TARGET_NVPTX
target-opencl TARGET_OPENCL
target-opengl TARGET_OPENGL
target-powerpc TARGET_POWERPC
target-riscv TARGET_RISCV
target-x86 TARGET_X86
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
target-aarch64 TARGET_AARCH64
target-amdgpu TARGET_AMDGPU
target-arm TARGET_ARM
target-d3d12compute TARGET_D3D12COMPUTE
target-hexagon TARGET_HEXAGON
target-metal TARGET_METAL
target-mips TARGET_MIPS
target-nvptx TARGET_NVPTX
target-opencl TARGET_OPENCL
target-opengl TARGET_OPENGL
target-powerpc TARGET_POWERPC
target-riscv TARGET_RISCV
target-x86 TARGET_X86
)

vcpkg_configure_cmake(
Expand All @@ -43,7 +45,7 @@ vcpkg_configure_cmake(
-DHALIDE_INSTALL_CMAKEDIR=share/${PORT}
)

vcpkg_install_cmake()
vcpkg_install_cmake(ADD_BIN_TO_PATH)

vcpkg_copy_tools(
TOOL_NAMES
Expand Down
202 changes: 202 additions & 0 deletions ports/halide/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"name": "halide",
"version": "12.0.1",
"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",
"dependencies": [
{
"name": "llvm",
"features": [
"clang",
"enable-rtti",
"tools"
]
}
],
"default-features": [
"jit"
],
"features": {
"jit": {
"description": "Include targets required for jit compilation",
"dependencies": [
{
"name": "halide",
"default-features": false,
"features": [
"target-aarch64"
],
"platform": "arm64"
},
{
"name": "halide",
"default-features": false,
"features": [
"target-x86"
],
"platform": "x86 | x64"
},
{
"name": "halide",
"default-features": false,
"features": [
"target-arm"
],
"platform": "arm & !arm64"
},
{
"name": "halide",
"features": [
"target-all"
],
"platform": "!x86 & !x64 & !arm & !arm64"
}
]
},
"target-aarch64": {
"description": "Include AArch64 target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-aarch64"
]
}
]
},
"target-all": {
"description": "Include all targets",
"dependencies": [
{
"name": "halide",
"default-features": false,
"features": [
"target-aarch64",
"target-amdgpu",
"target-arm",
"target-d3d12compute",
"target-hexagon",
"target-metal",
"target-mips",
"target-nvptx",
"target-opencl",
"target-opengl",
"target-powerpc",
"target-riscv",
"target-x86"
]
}
]
},
"target-amdgpu": {
"description": "Include AMDGPU target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-amdgpu"
]
}
]
},
"target-arm": {
"description": "Include ARM target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-arm"
]
}
]
},
"target-d3d12compute": {
"description": "Include Direct3D 12 Compute target"
},
"target-hexagon": {
"description": "Include Hexagon target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-hexagon"
]
}
]
},
"target-metal": {
"description": "Include Metal target"
},
"target-mips": {
"description": "Include Mips target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-mips"
]
}
]
},
"target-nvptx": {
"description": "Include NVPTX target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-nvptx"
]
}
]
},
"target-opencl": {
"description": "Include OpenCL-C target"
},
"target-opengl": {
"description": "Include OpenGL/GLSL target"
},
"target-powerpc": {
"description": "Include PowerPC target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-powerpc"
]
}
]
},
"target-riscv": {
"description": "Include RISCV target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-riscv"
]
}
]
},
"target-x86": {
"description": "Include X86 target",
"dependencies": [
{
"name": "llvm",
"default-features": false,
"features": [
"target-x86"
]
}
]
}
}
}
31 changes: 0 additions & 31 deletions ports/llvm/0001-add-msvc-options.patch

This file was deleted.

11 changes: 7 additions & 4 deletions ports/llvm/0003-fix-openmp-debug.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
openmp/runtime/src/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
index 81275c0483d..61468e048ec 100644
index 822f9ca2b825..814e25864610 100644
--- a/openmp/runtime/src/CMakeLists.txt
+++ b/openmp/runtime/src/CMakeLists.txt
@@ -136,7 +136,7 @@ libomp_get_ldflags(LIBOMP_CONFIGURED_LDFLAGS)
add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
@@ -157,7 +157,7 @@ else()
endif()

set_target_properties(omp PROPERTIES
- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}"
+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" DEBUG_POSTFIX ""
LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}"
LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE}
)
@@ -215,7 +215,7 @@ if(WIN32)
@@ -232,7 +232,7 @@ if(WIN32)
# Create new import library that is just the previously created one + kmp_import.cpp
add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
set_target_properties(ompimp PROPERTIES
Expand Down
Loading