- updated to 6.0.0

- removed obsolete cmake-dir patch

diff --git a/llvm-libcxxabi-cmake-dir.patch b/llvm-libcxxabi-cmake-dir.patch
deleted file mode 100644 (file)
index 846390e..0000000
--- a/llvm-libcxxabi-cmake-dir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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. "

diff --git a/llvm-libcxxabi.spec b/llvm-libcxxabi.spec
index 3d346043d73b9d7314f61f1d9186ba83d44e67f7..c6f715a4049f5673e034120b64459a895c460b83 100644 (file)
--- a/llvm-libcxxabi.spec
+++ b/llvm-libcxxabi.spec
@@ -1,18 +1,17 @@
 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.9.1
+Version:       6.0.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: 62fd584b38cc502172c2ffab041b5fcc
-Patch0:                %{name}-cmake-dir.patch
+#Source0Download: http://releases.llvm.org/download.html
+Source0:       http://releases.llvm.org/%{version}/libcxxabi-%{version}.src.tar.xz
+# Source0-md5: 9d06327892fc5d8acec4ef2e2821ab3d
 URL:           http://libcxxabi.llvm.org/
 BuildRequires: cmake >= 3.4.3
 BuildRequires: clang >= %{version}
-%ifarch arm
+%ifarch %{arm}
 BuildRequires: libunwind-devel
 %endif
 BuildRequires: llvm-devel >= %{version}
@@ -53,15 +52,14 @@ 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++" \
-       -DLLVM_CMAKE_PATH=%{_libdir}/cmake/llvm
+       -DCMAKE_CXX_COMPILER="clang++"
+
 %{__make}
 
 %install