[packages/llvm-libcxxabi] - updated to 3.9.0 - added cmake-dir patch to allow LLVM_CMAKE_PATH other than prefix/share/llvm/cma
qboosh
qboosh at pld-linux.org
Mon Nov 21 20:11:30 CET 2016
commit 522158c9752913a39dfbf7764499c46ad624993b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Nov 21 20:11:43 2016 +0100
- updated to 3.9.0
- added cmake-dir patch to allow LLVM_CMAKE_PATH other than prefix/share/llvm/cmake
llvm-libcxxabi-cmake-dir.patch | 20 ++++++++++++++++++++
llvm-libcxxabi.spec | 11 +++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/llvm-libcxxabi.spec b/llvm-libcxxabi.spec
index c985aeb..312d902 100644
--- a/llvm-libcxxabi.spec
+++ b/llvm-libcxxabi.spec
@@ -1,15 +1,16 @@
Summary: libc++abi - C++ standard library support from LLVM project
Summary(pl.UTF-8): libc++abi - wsparcie dla biblioteki standardowej C++ z projektu LLVM
Name: llvm-libcxxabi
-Version: 3.8.1
+Version: 3.9.0
Release: 1
License: MIT or BSD-like
Group: Libraries
#Source0Download: http://llvm.org/releases/download.html
Source0: http://llvm.org/releases/%{version}/libcxxabi-%{version}.src.tar.xz
-# Source0-md5: 3c63b03ba2f30a01279ca63384a67773
+# Source0-md5: d02642308e22e614af6b061b9b4fedfa
+Patch0: %{name}-cmake-dir.patch
URL: http://libcxxabi.llvm.org/
-BuildRequires: cmake >= 2.8.8
+BuildRequires: cmake >= 3.4.3
BuildRequires: clang >= %{version}
%ifarch arm
BuildRequires: libunwind-devel
@@ -52,13 +53,15 @@ Statyczna biblioteka LLVM libc++abi.
%prep
%setup -q -n libcxxabi-%{version}.src
+%patch0 -p1
%build
install -d build
cd build
%cmake .. \
-DCMAKE_C_COMPILER="clang" \
- -DCMAKE_CXX_COMPILER="clang++"
+ -DCMAKE_CXX_COMPILER="clang++" \
+ -DLLVM_CMAKE_PATH=%{_libdir}/cmake/llvm
%{__make}
%install
diff --git a/llvm-libcxxabi-cmake-dir.patch b/llvm-libcxxabi-cmake-dir.patch
new file mode 100644
index 0000000..846390e
--- /dev/null
+++ b/llvm-libcxxabi-cmake-dir.patch
@@ -0,0 +1,20 @@
+--- libcxxabi-3.9.0.src/CMakeLists.txt.orig 2016-08-08 22:06:27.000000000 +0200
++++ libcxxabi-3.9.0.src/CMakeLists.txt 2016-11-21 18:38:52.075774263 +0100
+@@ -18,7 +18,7 @@
+ set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+ set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")
+ set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})
+- set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")
++ set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules" CACHE PATH "Path to cmake files")
+ elseif(LLVM_CONFIG)
+ message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
+ set(CONFIG_COMMAND ${LLVM_CONFIG}
+@@ -47,7 +47,7 @@
+ set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+ set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
+ set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
+- set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
++ set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules" CACHE PATH "Path to cmake files")
+ set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py")
+ else()
+ message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. "
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm-libcxxabi.git/commitdiff/522158c9752913a39dfbf7764499c46ad624993b
More information about the pld-cvs-commit
mailing list