diff --git a/.gitignore b/.gitignore index 6ed87d2..e72f01f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /llvm-3.9.1.src.tar.xz /llvm-4.0.0.src.tar.xz /llvm-4.0.1.src.tar.xz +/llvm-5.0.0.src.tar.xz diff --git a/0001-CMake-Split-static-library-exports-into-their-own-ex.patch b/0001-CMake-Split-static-library-exports-into-their-own-ex.patch index 2804e1b..123fb1a 100644 --- a/0001-CMake-Split-static-library-exports-into-their-own-ex.patch +++ b/0001-CMake-Split-static-library-exports-into-their-own-ex.patch @@ -1,4 +1,4 @@ -From a5f39924a3466eb12d764993aaa8c1c308f92925 Mon Sep 17 00:00:00 2001 +From 80d3393d3e324dd8bef7de1b9c6db3010585f3e8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 29 Apr 2017 02:03:23 +0000 Subject: [PATCH] CMake: Split static library exports into their own export @@ -31,10 +31,10 @@ Differential Revision: https://reviews.llvm.org/D32668 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index b3c7746..7d9d253 100644 +index 1c92265..e1ad9b9 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -587,7 +587,11 @@ macro(add_llvm_library name) +@@ -603,7 +603,11 @@ macro(add_llvm_library name) if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR NOT LLVM_DISTRIBUTION_COMPONENTS) @@ -69,10 +69,10 @@ index ac4b0b7..f77c905 100644 install(FILES diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in -index c30c92b..f0f17b2 100644 +index 7a8eb36..1fa0028 100644 --- a/cmake/modules/LLVMConfig.cmake.in +++ b/cmake/modules/LLVMConfig.cmake.in -@@ -73,6 +73,8 @@ if(NOT TARGET LLVMSupport) +@@ -77,6 +77,8 @@ if(NOT TARGET LLVMSupport) set(LLVM_EXPORTED_TARGETS "@LLVM_CONFIG_EXPORTS@") include("@LLVM_CONFIG_EXPORTS_FILE@") @llvm_config_include_buildtree_only_exports@ @@ -80,7 +80,7 @@ index c30c92b..f0f17b2 100644 + include("@LLVM_CONFIG_STATIC_EXPORTS_FILE@" OPTIONAL) endif() - include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake) + set_property(GLOBAL PROPERTY LLVM_TARGETS_CONFIGURED On) -- -2.9.3 +1.8.3.1 diff --git a/llvm.spec b/llvm.spec index ccfd06b..17ccaf0 100644 --- a/llvm.spec +++ b/llvm.spec @@ -6,10 +6,13 @@ %endif %global llvm_bindir %{_libdir}/%{name} +%global maj_ver 5 +%global min_ver 0 +%global patch_ver 0 Name: llvm -Version: 4.0.1 -Release: 6%{?dist} +Version: %{maj_ver}.%{min_ver}.%{patch_ver} +Release: 1%{?dist} Summary: The Low Level Virtual Machine License: NCSA @@ -18,11 +21,10 @@ Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz # recognize s390 as SystemZ when configuring build Patch0: llvm-3.7.1-cmake-s390.patch -Patch2: rust-lang-llvm-pr67.patch Patch3: 0001-CMake-Split-static-library-exports-into-their-own-ex.patch -Patch4: 0001-Revert-Revert-CMake-Move-sphinx-detection-into-AddSp.patch -Patch5: 0001-CMake-Fix-docs-llvm-man-target-when-clang-llvm-is-in.patch -Patch6: 0001-CMake-Add-LLVM_UTILS_INSTALL_DIR-option.patch +# FIXME: Symbol versioning breaks some unittests when statically linking +# libstdc++, so we disable it for now. +Patch4: 0001-Revert-Add-a-linker-script-to-version-LLVM-symbols.patch BuildRequires: cmake BuildRequires: zlib-devel @@ -185,6 +187,7 @@ fi %{_mandir}/man1/*.1.* %exclude %{_bindir}/llvm-config-%{__isa_bits} %exclude %{_mandir}/man1/llvm-config.1.* +%{_datadir}/opt-viewer %files libs %{_libdir}/BugpointPasses.so @@ -192,7 +195,7 @@ fi %if %{with gold} %{_libdir}/LLVMgold.so %endif -%{_libdir}/libLLVM-4.0*.so +%{_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so %{_libdir}/libLTO.so* %files devel @@ -212,6 +215,9 @@ fi %{_libdir}/cmake/llvm/LLVMStaticExports.cmake %changelog +* Mon Sep 25 2017 Tom Stellard - 5.0.0-1 +- 5.0.0 Release + * Mon Sep 18 2017 Tom Stellard - 4.0.1-6 - Add Requires: libedit-devel for llvm-devel diff --git a/sources b/sources index 63d18e7..3d177fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (llvm-4.0.0.src.tar.xz) = cf681f0626ef6d568d951cdc3e143471a1d7715a0ba11e52aa273cf5d8d421e1357ef2645cc85879eaefcd577e99e74d07b01566825b3d0461171ef2cbfc7704 SHA512 (llvm-4.0.1.src.tar.xz) = 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d +SHA512 (llvm-5.0.0.src.tar.xz) = e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a