update llvm to 6.0.0 (#3118)

2 files changed, 86 insertions, 86 deletions

diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL
index ecc6346ca..27604d397 100644
--- a/ports/llvm/CONTROL
+++ b/ports/llvm/CONTROL
@@ -1,4 +1,4 @@
-Source: llvm
-Version: 5.0.1
-Description: The LLVM Compiler Infrastructure
-Build-Depends: atlmfc
+Source: llvm

+Version: 6.0.0

+Description: The LLVM Compiler Infrastructure

+Build-Depends: atlmfc

diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index 60580947e..795d72d31 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -1,82 +1,82 @@
-# LLVM documentation recommends always using static library linkage when
-#   building with Microsoft toolchain; it's also the default on other platforms
-set(VCPKG_LIBRARY_LINKAGE static)
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "llvm cannot currently be built for UWP")
-endif()
-
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-5.0.1.src)
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz"
-    FILENAME "llvm-5.0.1.src.tar.xz"
-    SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_download_distfile(CLANG_ARCHIVE
-    URLS "http://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz"
-    FILENAME "cfe-5.0.1.src.tar.xz"
-    SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2
-)
-vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools)
-
-if(NOT EXISTS ${SOURCE_PATH}/tools/clang)
-  file(RENAME ${SOURCE_PATH}/tools/cfe-5.0.1.src ${SOURCE_PATH}/tools/clang)
-endif()
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DLLVM_TARGETS_TO_BUILD=X86
-        -DLLVM_INCLUDE_TOOLS=ON
-        -DLLVM_INCLUDE_UTILS=OFF
-        -DLLVM_INCLUDE_EXAMPLES=OFF
-        -DLLVM_INCLUDE_TESTS=OFF
-        -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF
-        -DLLVM_TOOLS_INSTALL_DIR=tools/llvm
-)
-
-vcpkg_install_cmake()
-
-file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*)
-file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*)
-file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm)
-file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm)
-file(REMOVE ${EXE})
-file(REMOVE ${DEBUG_EXE})
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clang TARGET_PATH share/clang)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)
-
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/tools
-    ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/debug/bin
-    ${CURRENT_PACKAGES_DIR}/debug/msbuild-bin
-    ${CURRENT_PACKAGES_DIR}/bin
-    ${CURRENT_PACKAGES_DIR}/msbuild-bin
-    ${CURRENT_PACKAGES_DIR}/tools/msbuild-bin
-)
-
-# Remove one empty include subdirectory if it is indeed empty
-file(GLOB MCANALYSISFILES ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis/*)
-if(NOT MCANALYSISFILES)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis)
-endif()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)
+# LLVM documentation recommends always using static library linkage when

+#   building with Microsoft toolchain; it's also the default on other platforms

+set(VCPKG_LIBRARY_LINKAGE static)

+

+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+    message(FATAL_ERROR "llvm cannot currently be built for UWP")

+endif()

+

+include(vcpkg_common_functions)

+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-6.0.0.src)

+vcpkg_download_distfile(ARCHIVE

+    URLS "http://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz"

+    FILENAME "llvm-6.0.0.src.tar.xz"

+    SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c

+)

+vcpkg_extract_source_archive(${ARCHIVE})

+

+vcpkg_download_distfile(CLANG_ARCHIVE

+    URLS "http://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz"

+    FILENAME "cfe-6.0.0.src.tar.xz"

+    SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6

+)

+vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools)

+

+if(NOT EXISTS ${SOURCE_PATH}/tools/clang)

+  file(RENAME ${SOURCE_PATH}/tools/cfe-6.0.0.src ${SOURCE_PATH}/tools/clang)

+endif()

+

+vcpkg_apply_patches(

+    SOURCE_PATH ${SOURCE_PATH}

+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch

+)

+

+vcpkg_find_acquire_program(PYTHON3)

+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)

+set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+    PREFER_NINJA

+    OPTIONS

+        -DLLVM_TARGETS_TO_BUILD=X86

+        -DLLVM_INCLUDE_TOOLS=ON

+        -DLLVM_INCLUDE_UTILS=OFF

+        -DLLVM_INCLUDE_EXAMPLES=OFF

+        -DLLVM_INCLUDE_TESTS=OFF

+        -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF

+        -DLLVM_TOOLS_INSTALL_DIR=tools/llvm

+)

+

+vcpkg_install_cmake()

+

+file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*)

+file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*)

+file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm)

+file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm)

+file(REMOVE ${EXE})

+file(REMOVE ${DEBUG_EXE})

+

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clang TARGET_PATH share/clang)

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)

+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)

+

+file(REMOVE_RECURSE

+    ${CURRENT_PACKAGES_DIR}/debug/include

+    ${CURRENT_PACKAGES_DIR}/debug/tools

+    ${CURRENT_PACKAGES_DIR}/debug/share

+    ${CURRENT_PACKAGES_DIR}/debug/bin

+    ${CURRENT_PACKAGES_DIR}/debug/msbuild-bin

+    ${CURRENT_PACKAGES_DIR}/bin

+    ${CURRENT_PACKAGES_DIR}/msbuild-bin

+    ${CURRENT_PACKAGES_DIR}/tools/msbuild-bin

+)

+

+# Remove one empty include subdirectory if it is indeed empty

+file(GLOB MCANALYSISFILES ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis/*)

+if(NOT MCANALYSISFILES)

+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis)

+endif()

+

+# Handle copyright

+file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)