diff options
| author | Oliver Hitchcock <ojhitchcock@gmail.com> | 2019-07-09 18:59:47 +0100 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-07-09 10:59:47 -0700 |
| commit | 22bc820f5eb4057287f4af7d0e2974d0291dece4 (patch) | |
| tree | 1ed02dea855e392b5610ccc17a09789ea8f39d7e | |
| parent | a502e9a7b7eceec8380ba7c71d6ab702e0d0520a (diff) | |
| download | vcpkg-22bc820f5eb4057287f4af7d0e2974d0291dece4.tar.gz vcpkg-22bc820f5eb4057287f4af7d0e2974d0291dece4.zip | |
Update to llvm-8.0.0 (#7209)
| -rw-r--r-- | ports/llvm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/llvm/install-cmake-modules-to-share.patch | 12 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 23 |
3 files changed, 21 insertions, 16 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index f700235a6..d7ee8524b 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,5 +1,5 @@ Source: llvm
-Version: 7.0.0-3
+Version: 8.0.0
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)
diff --git a/ports/llvm/install-cmake-modules-to-share.patch b/ports/llvm/install-cmake-modules-to-share.patch index 1a2b3b0db..0e789377a 100644 --- a/ports/llvm/install-cmake-modules-to-share.patch +++ b/ports/llvm/install-cmake-modules-to-share.patch @@ -1,15 +1,15 @@ -diff -urN llvm-7.0.0.src-orig/cmake/modules/CMakeLists.txt llvm-7.0.0.src/cmake/modules/CMakeLists.txt ---- llvm-7.0.0.src-orig/cmake/modules/CMakeLists.txt 2018-07-27 13:57:51.000000000 +0300 -+++ llvm-7.0.0.src/cmake/modules/CMakeLists.txt 2019-03-26 14:56:34.645434190 +0200 +diff -urN llvm-8.0.0.src-orig/cmake/modules/CMakeLists.txt llvm-8.0.0.src/cmake/modules/CMakeLists.txt +--- llvm-8.0.0.src-orig/cmake/modules/CMakeLists.txt 2018-07-27 13:57:51.000000000 +0300 ++++ llvm-8.0.0.src/cmake/modules/CMakeLists.txt 2019-03-26 14:56:34.645434190 +0200 @@ -1,4 +1,4 @@ -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 -urN llvm-7.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt llvm-7.0.0.src/tools/clang/cmake/modules/CMakeLists.txt ---- llvm-7.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt 2018-01-24 21:26:50.000000000 +0200 -+++ llvm-7.0.0.src/tools/clang/cmake/modules/CMakeLists.txt 2019-03-26 14:57:07.173362736 +0200 +diff -urN llvm-8.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt llvm-8.0.0.src/tools/clang/cmake/modules/CMakeLists.txt +--- llvm-8.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt 2018-01-24 21:26:50.000000000 +0200 ++++ llvm-8.0.0.src/tools/clang/cmake/modules/CMakeLists.txt 2019-03-26 14:57:07.173362736 +0200 @@ -1,11 +1,11 @@ # 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 diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 1828ea86e..891e41738 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -7,23 +7,23 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") endif()
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-7.0.0.src)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-8.0.0.src)
vcpkg_download_distfile(ARCHIVE
- URLS "http://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz"
- FILENAME "llvm-7.0.0.src.tar.xz"
- SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
+ URLS "http://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz"
+ FILENAME "llvm-8.0.0.src.tar.xz"
+ SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_download_distfile(CLANG_ARCHIVE
- URLS "http://releases.llvm.org/7.0.0/cfe-7.0.0.src.tar.xz"
- FILENAME "cfe-7.0.0.src.tar.xz"
- SHA512 17a658032a0160c57d4dc23cb45a1516a897e0e2ba4ebff29472e471feca04c5b68cff351cdf231b42aab0cff587b84fe11b921d1ca7194a90e6485913d62cb7
+ URLS "http://releases.llvm.org/8.0.0/cfe-8.0.0.src.tar.xz"
+ FILENAME "cfe-8.0.0.src.tar.xz"
+ SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
)
vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools)
if(NOT EXISTS ${SOURCE_PATH}/tools/clang)
- file(RENAME ${SOURCE_PATH}/tools/cfe-7.0.0.src ${SOURCE_PATH}/tools/clang)
+ file(RENAME ${SOURCE_PATH}/tools/cfe-8.0.0.src ${SOURCE_PATH}/tools/clang)
endif()
vcpkg_apply_patches(
@@ -101,11 +101,16 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/BinaryFormat/WasmRelocs
)
-# Remove one empty include subdirectory if it is indeed empty
+# Remove two empty include subdirectorys if they are 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()
+file(GLOB MACHOFILES ${CURRENT_PACKAGES_DIR}/include/llvm/TextAPI/MachO/*)
+if(NOT MACHOFILES)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/TextAPI/MachO)
+endif()
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)
|