diff --git a/libcxx-CmakeLists.txt b/libcxx-17.0.5-CmakeLists.txt similarity index 81% rename from libcxx-CmakeLists.txt rename to libcxx-17.0.5-CmakeLists.txt index cf07074..42df27f 100644 --- a/libcxx-CmakeLists.txt +++ b/libcxx-17.0.5-CmakeLists.txt @@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 3.13.4) project(Runtimes C CXX ASM) add_subdirectory(libcxxabi) add_subdirectory(libcxx) +add_subdirectory(libunwind) diff --git a/libcxx.spec b/libcxx.spec index 397374f..44df791 100644 --- a/libcxx.spec +++ b/libcxx.spec @@ -1,5 +1,5 @@ Name: libcxx -Version: 16.0.5 +Version: 17.0.5 Release: 1mamba Summary: An implementation of the C++ standard library, targeting C++11, C++14 and above Group: System/Libraries @@ -10,11 +10,13 @@ URL: https://libcxx.llvm.org/ Source: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/libcxx-%{version}.src.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/libcxxabi-%{version}.src.tar.xz Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/cmake-%{version}.src.tar.xz -Source5: libcxx-CmakeLists.txt +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/runtimes-%{version}.src.tar.xz +Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/libunwind-%{version}.src.tar.xz +# From Fedora +Source5: libcxx-17.0.5-CmakeLists.txt License: MIT, BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libatomic-devel BuildRequires: libgcc ## AUTOBUILDREQ-END BuildRequires: cmake @@ -54,12 +56,15 @@ This package contains libraries and header files for developing applications tha %debug_package %prep -%setup -q -c -a1 -a2 +%setup -q -c -a1 -a2 -a3 -a4 #% setup -q -c -D -T #:<< _EOF mv libcxx-%{version}.src libcxx mv libcxxabi-%{version}.src libcxxabi mv cmake-%{version}.src cmake +mv runtimes-%{version}.src runtimes +mv libunwind-%{version}.src libunwind + cp %{SOURCE5} CMakeLists.txt %build @@ -68,18 +73,20 @@ mkdir -p build cd build cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ %if 0%{?__isa_bits} == 64 -DLIBCXX_LIBDIR_SUFFIX:STRING=64 \ -DLIBCXXABI_LIBDIR_SUFFIX:STRING=64 \ + -DLIBUNWIND_LIBDIR_SUFFIX:STRING=64 \ %endif -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=ON \ .. - + +# -DBUILD_SHARED_LIBS=ON + ninja %install @@ -125,6 +132,9 @@ DESTDIR=%{buildroot} ninja install-cxx install-cxxabi %{_libdir}/libc++abi.a %changelog +* Fri Nov 17 2023 Automatic Build System 17.0.5-1mamba +- automatic version update by autodist + * Sat Jun 03 2023 Automatic Build System 16.0.5-1mamba - automatic version update by autodist