[packages/llvm-libcxx] - up to 9.0.1 - added experimental patch (fix libc++experimental.a install)

qboosh qboosh at pld-linux.org
Sun Feb 2 19:27:49 CET 2020


commit b5e591816c36055ae49126a835c56805f42570ce
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 2 19:28:08 2020 +0100

    - up to 9.0.1
    - added experimental patch (fix libc++experimental.a install)

 llvm-libcxx-experimental.patch | 11 +++++++++++
 llvm-libcxx.spec               | 10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/llvm-libcxx.spec b/llvm-libcxx.spec
index 9eda5bf..6afbf23 100644
--- a/llvm-libcxx.spec
+++ b/llvm-libcxx.spec
@@ -5,13 +5,14 @@
 Summary:	LibC++ - C++ standard library from LLVM project
 Summary(pl.UTF-8):	LibC++ - biblioteka standardowa C++ z projektu LLVM
 Name:		llvm-libcxx
-Version:	8.0.1
+Version:	9.0.1
 Release:	1
 License:	MIT or BSD-like
 Group:		Libraries
-#Source0Download: http://releases.llvm.org/download.html
+#Source0Download: https://github.com/llvm/llvm-project/releases/
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/libcxx-%{version}.src.tar.xz
-# Source0-md5:	1f5a621c2d3d8edd94ef16dc55ae5547
+# Source0-md5:	689a42dbae917ed2a20b92deb4fd6de7
+Patch0:		%{name}-experimental.patch
 URL:		http://libcxx.llvm.org/
 BuildRequires:	cmake >= 3.4.3
 BuildRequires:	rpmbuild(macros) >= 1.605
@@ -61,12 +62,14 @@ Statyczna biblioteka LLVM LibC++.
 
 %prep
 %setup -q -n libcxx-%{version}.src
+%patch0 -p1
 
 %build
 install -d build
 cd build
 libsubdir=%{_lib}
 %cmake .. \
+	-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=ON \
 	-DLIBCXX_LIBDIR_SUFFIX="${libsubdir#lib}" \
 %if %{with gnu}
 	-DLIBCXX_CXX_ABI=libstdc++ \
@@ -100,7 +103,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libc++.so
 %{_libdir}/libc++experimental.a
-%{_libdir}/libc++fs.a
 %dir %{_includedir}/c++
 %{_includedir}/c++/v1
 
diff --git a/llvm-libcxx-experimental.patch b/llvm-libcxx-experimental.patch
new file mode 100644
index 0000000..5bbd119
--- /dev/null
+++ b/llvm-libcxx-experimental.patch
@@ -0,0 +1,11 @@
+--- libcxx-9.0.1.src/src/CMakeLists.txt.orig	2019-12-11 20:15:30.000000000 +0100
++++ libcxx-9.0.1.src/src/CMakeLists.txt	2020-02-02 19:24:28.126472426 +0100
+@@ -448,7 +448,7 @@
+   endif()
+ 
+   if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY)
+-    install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${experimental_lib}
++    install(TARGETS cxx_experimental
+       LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+       ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+       RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/llvm-libcxx.git/commitdiff/b5e591816c36055ae49126a835c56805f42570ce



More information about the pld-cvs-commit mailing list