diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
| commit | 5b1e426929b40a9b60809284993b424b841a28fc (patch) | |
| tree | bd12300ad859bababb7d4acc03700fd31949fddc /ports/llvm | |
| parent | 279e25aecfe30f55296881ea9b0236c1d6ee030a (diff) | |
| parent | 358ec0954d9b71b0def4fd4b4dbafdd0b8478d81 (diff) | |
| download | vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.tar.gz vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.zip | |
Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
# scripts/cmake/vcpkg_common_definitions.cmake
Diffstat (limited to 'ports/llvm')
| -rw-r--r-- | ports/llvm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/llvm/fix-linux-build.patch | 13 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index d7ee8524b..9a49e3cc2 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,5 +1,5 @@ Source: llvm
-Version: 8.0.0
+Version: 8.0.0-1
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)
diff --git a/ports/llvm/fix-linux-build.patch b/ports/llvm/fix-linux-build.patch new file mode 100644 index 000000000..780ea6535 --- /dev/null +++ b/ports/llvm/fix-linux-build.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake +index 900c35e..78fd3cd 100644 +--- a/cmake/config-ix.cmake ++++ b/cmake/config-ix.cmake +@@ -154,7 +154,7 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*") + else() + include_directories(${LIBXML2_INCLUDE_DIR}) + endif() +- set(LIBXML2_LIBS "xml2") ++ set(LIBXML2_LIBS ${LIBXML2_LIBRARIES}) + endif() + endif() + endif() diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 891e41738..07c9d9ad1 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_apply_patches( PATCHES
install-cmake-modules-to-share.patch
fix-build-error.patch
+ fix-linux-build.patch
)
vcpkg_find_acquire_program(PYTHON3)
|