0001-PATCH-libcxx-Remove-monorepo-requirement.patch

@@ -0,0 +1,35 @@
+From fc46c464795f965c4cdbc321058f24191af8e40c Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Tue, 11 Aug 2020 07:55:18 -0700
+Subject: [PATCH] [PATCH][libcxx] Remove monorepo requirement
+ 
+---
+ libcxx/CMakeLists.txt | 9 ---------
+ 1 file changed, 9 deletions(-)
+ 
+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
+index 9bf1a02..5348a15 100644
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -1,10 +1,3 @@
+-# See https://libcxx.llvm.org/docs/BuildingLibcxx.html for instructions on how
+-# to build libcxx with CMake.
+-
+-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxxabi")
+-  message(FATAL_ERROR "libc++ now requires being built in a monorepo layout with libcxxabi available")
+-endif()
+-
+ #===============================================================================
+ # Setup Project
+ #===============================================================================
+@@ -39,8 +32,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
+   set(LIBCXX_STANDALONE_BUILD 1)
+   set(LLVM_LIT_OUTPUT_DIR "${LIBCXX_BINARY_DIR}/bin")
+ 
+-  # Find the LLVM sources and simulate LLVM CMake options.
+-  include(HandleOutOfTreeLLVM)
+ endif()
+ 
+ if (LIBCXX_STANDALONE_BUILD)
+-- 
+1.8.3.1

0001-libcxx-Remove-monorepo-requirement.patch

@@ -0,0 +1,34 @@
+From 89a9306a9c24b192b9fac3b7498661428676af0e Mon Sep 17 00:00:00 2001
+From: wangzehong <wangzehong2@huawei.com>
+Date: Fri, 10 Feb 2023 09:06:21 +0800
+Subject: [PATCH] Remove monorepo requirement
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cdd5495..11fc89b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ # See https://libcxx.llvm.org/docs/BuildingLibcxx.html for instructions on how
+ # to build libcxx with CMake.
+ 
+-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxxabi")
+-  message(FATAL_ERROR "libc++ now requires being built in a monorepo layout with libcxxabi available")
+-endif()
+ 
+ #===============================================================================
+ # Setup Project
+@@ -39,8 +36,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
+   set(LIBCXX_STANDALONE_BUILD 1)
+   set(LLVM_LIT_OUTPUT_DIR "${LIBCXX_BINARY_DIR}/bin")
+ 
+-  # Find the LLVM sources and simulate LLVM CMake options.
+-  include(HandleOutOfTreeLLVM)
+ endif()
+ 
+ if (LIBCXX_STANDALONE_BUILD)
+-- 
+2.33.1.windows.1

CMakeLists.txt

@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.13.4)
-project(Runtimes C CXX ASM)
-add_subdirectory(libcxxabi)
-add_subdirectory(libcxx)
-add_subdirectory(libunwind)

README.en.md

@@ -1,4 +1,4 @@
-# libcxx-latest
+# libcxx
 
 #### Description
 The libcxx is c++ libs of llvm for openEuler

README.md

@@ -1,4 +1,4 @@
-# libcxx-latest
+# libcxx
 
 #### 介绍
 The libcxx is c++ libs of llvm for openEuler

fedora-standalone.patch

@@ -1,22 +0,0 @@
-From 0ef68aab2b08915b9144ffa67b3319e3e8332445 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Thu, 4 Aug 2022 12:44:15 +0200
-Subject: [PATCH] Fix standalone build
- 
----
- libunwind/docs/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+)
- 
-diff --git a/libunwind/docs/CMakeLists.txt b/libunwind/docs/CMakeLists.txt
-index 79b87eb03b44..eaf6f3db5223 100644
---- a/libunwind/docs/CMakeLists.txt
-+++ b/libunwind/docs/CMakeLists.txt
-@@ -1,5 +1,6 @@
- include(FindSphinx)
- if (SPHINX_FOUND AND LLVM_ENABLE_SPHINX)
-+  include(AddLLVM)
-   include(AddSphinxTarget)
-   if (${SPHINX_OUTPUT_HTML})
-     add_sphinx_target(html libunwind)
--- 
-2.37.1

libcxx.spec

@@ -1,283 +1,71 @@
-%bcond_without check
+%global debug_package %{nil}
-%bcond_without toolchain_clang
 
-%if %{with toolchain_clang}
+Name:           libcxx
-%global toolchain clang
+Version:        12.0.1
-%endif
+Release:        1%{?dist}
+Summary:        LLVM "libcxx" runtime libraries
+License:        BSD
+URL:            http://llvm.org
+Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/libcxx-%{version}.src.tar.xz
 
-%global maj_ver 18
+Patch0:        0001-libcxx-Remove-monorepo-requirement.patch
-%global min_ver 1
+BuildRequires:  gcc
-%global patch_ver 8
+BuildRequires:  gcc-c++
-%global libcxx_version %{maj_ver}.%{min_ver}.%{patch_ver}
+BuildRequires:  cmake
-
+BuildRequires:  python3
-%global libcxx_srcdir libcxx-%{libcxx_version}.src
-%global libcxxabi_srcdir libcxxabi-%{libcxx_version}.src
-%global libunwind_srcdir libunwind-%{libcxx_version}.src
-%global runtimes_srcdir runtimes-%{libcxx_version}.src
-%global runtimes_cmakedir %{runtimes_srcdir}/cmake/Modules
-
-%global _scl_prefix /opt/openEuler
-%{?scl:%scl_package %scl}
-%{!?scl:%global scl_prefix llvm-toolset-%{maj_ver}-}
-%{!?scl:%global pkg_name %{name}}
-%global install_prefix %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_prefix}
-%global install_datadir %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_datadir}
-
-%if 0%{?__isa_bits} == 64
-%global install_libdir %{install_prefix}/lib64
-%else
-%global install_libdir %{install_prefix}/lib
-%endif
-%global install_includedir %{install_prefix}/include
-
-Name:       %{?scl_prefix}libcxx
-Version:    %{libcxx_version}
-Release:    1
-Summary:    LLVM "libcxx" runtime libraries
-License:    Apache-2.0
-URL:        http://llvm.org
-Source0:    https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libcxx_version}/%{libcxx_srcdir}.tar.xz
-Source1:    https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libcxx_version}/%{libcxxabi_srcdir}.tar.xz
-Source2:    https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libcxx_version}/%{libunwind_srcdir}.tar.xz
-Source3:    https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libcxx_version}/%{runtimes_srcdir}.tar.xz
-Source4:    CMakeLists.txt
-
-Patch0:     fedora-standalone.patch
-
-%if "%toolchain" == "clang"
-BuildRequires:  clang
-%endif
-BuildRequires:  %{?scl_prefix}clang cmake ninja-build
-BuildRequires:  %{?scl_prefix}llvm-devel = %{version}
-BuildRequires:  %{?scl_prefix}llvm-cmake-utils = %{version}
-
-# We need python3-devel for %%py3_shebang_fix
-BuildRequires:    python3-devel
-
-# For documentation
-BuildRequires:    python3-sphinx
-
-%{?scl:Requires: %scl_runtime}
 
 %description
 The libcxx-devel package includes the libraries and header files for libcxx.
 
-# libcxx
+    
 %package devel
 Summary:    Headers and libraries for libcxx devel
-Requires:   %{pkg_name}%{?_isa} = %{version}-%{release}
+Requires:    %{name}%{?_isa} = %{version}-%{release}
-Requires:   libcxxabi-devel
+ 
-
 %description devel
 %{summary}.
 
-%package static
-Summary:    Static libraries for libcxx
-
-%description static
-%{summary}.
-
-
-# libcxxabi
-%package -n %{?scl_prefix}libcxxabi
-Summary:    Low level support for a standard C++ library
-
-%description -n %{?scl_prefix}libcxxabi
-libcxxabi provides low level support for a standard C++ library.
-
-%package -n %{?scl_prefix}libcxxabi-devel
-Summary:    Headers and libraries for libcxxabi devel
-Requires:    %{?scl_prefix}libcxxabi%{?_isa} = %{version}-%{release}
-
-%description -n %{?scl_prefix}libcxxabi-devel
-%{summary}.
-
-%package -n %{?scl_prefix}libcxxabi-static
-Summary:    Static libraries for libcxxabi
-
-%description -n %{?scl_prefix}libcxxabi-static
-%{summary}.
-
-
-# libunwind
-%package -n %{?scl_prefix}llvm-libunwind
-Summary:    LLVM libunwind
-
-%description -n %{?scl_prefix}llvm-libunwind
-
-LLVM libunwind is an implementation of the interface defined by the HP libunwind
-project. It was contributed Apple as a way to enable clang++ to port to
-platforms that do not have a system unwinder. It is intended to be a small and
-fast implementation of the ABI, leaving off some features of HP's libunwind
-that never materialized (e.g. remote unwinding).
-
-%package -n %{?scl_prefix}llvm-libunwind-devel
-Summary:    LLVM libunwind development files
-Provides:   %{?scl_prefix}libunwind(major) = %{maj_ver}
-Requires:   %{?scl_prefix}llvm-libunwind%{?_isa} = %{version}-%{release}
-
-%description -n %{?scl_prefix}llvm-libunwind-devel
-Unversioned shared library for LLVM libunwind
-
-%package -n %{?scl_prefix}llvm-libunwind-static
-Summary: Static library for LLVM libunwind
-
-%description -n %{?scl_prefix}llvm-libunwind-static
-%{summary}.
-
-%package -n %{?scl_prefix}llvm-libunwind-doc
-Summary:    libunwind documentation
-# jquery.js and langage_data.js are used in the HTML doc and under BSD License
-License:    BSD AND (Apache-2.0 WITH LLVM-exception OR NCSA OR MIT)
-
-%description -n %{?scl_prefix}llvm-libunwind-doc
-Documentation for LLVM libunwind
-
 %prep
-%setup -T -q -b 0 -n %{libcxx_srcdir}
+%autosetup -n libcxx-%{version}.src
-%setup -T -q -b 1 -n %{libcxxabi_srcdir}
-%setup -T -q -b 2 -n %{libunwind_srcdir}
-%setup -T -q -b 3 -n %{runtimes_srcdir}
-%setup -T -c -n build
-
-cp %{SOURCE4} .
-mv ../%{libcxx_srcdir} libcxx
-mv ../%{libcxxabi_srcdir} libcxxabi
-mv ../%{libunwind_srcdir} libunwind
-mkdir -p runtimes/cmake/Modules
-cp ../%{runtimes_cmakedir}/HandleFlags.cmake  runtimes/cmake/Modules/
-cp ../%{runtimes_cmakedir}/WarningFlags.cmake runtimes/cmake/Modules/
-
-%autopatch -p1
-
-#%py3_shebang_fix libcxx/utils/
 
 %build
 mkdir -p _build
 cd _build
-# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
-export ASMFLAGS=$CFLA
 
-%cmake -GNinja \
+cmake \
-    -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
+        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-    -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DLLVM_MAIN_SRC_DIR=%{install_prefix}/src \
+        -DCMAKE_C_COMPILER_TARGET=%{_arch} \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-    -DCMAKE_MODULE_PATH="%{install_libdir}/cmake/llvm;%{install_datadir}/llvm/cmake/Modules" \
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
 %if 0%{?__isa_bits} == 64
-    -DLIBCXX_LIBDIR_SUFFIX:STRING=64 \
+        -DLLVM_LIBDIR_SUFFIX=64 \
-    -DLIBCXXABI_LIBDIR_SUFFIX:STRING=64 \
+%else
-    -DLIBUNWIND_LIBDIR_SUFFIX:STRING=64 \
+        -DLLVM_LIBDIR_SUFFIX= \
 %endif
-    -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
+  ..
-    -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \
-    -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=ON \
-    -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
-    -DLLVM_BUILD_DOCS=ON \
-    -DLLVM_ENABLE_SPHINX=ON \
-    -DLIBUNWIND_INCLUDE_DOCS=ON \
-    -DLIBUNWIND_INSTALL_INCLUDE_DIR=%{install_includedir}/llvm-libunwind \
-    -DLIBUNWIND_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \
-%if "%{toolchain}" == "clang"
-	-DCMAKE_C_COMPILER=clang \
-	-DCMAKE_CXX_COMPILER=clang++ \
-%endif
-    ..
 
-%ninja_build
+%make_build
+# Copy result libc++.a
+mkdir results-static
+find . -name libc++.a -exec cp {} ./results-static \;
+cp ../src/include/atomic_support.h include/c++/v1
+cp ../src/include/refstring.h include/c++/v1
 
 %install
 cd _build
+%make_install
+install results-static/libc++.a %{buildroot}/%{_libdir}
+install include/c++/v1/atomic_support.h %{buildroot}/%{_libdir}/../include/c++/v1
+install include/c++/v1/refstring.h %{buildroot}/%{_libdir}/../include/c++/v1
 
-%ninja_install
-# We can't install the unversionned path on default location because that would conflict with
-# https://src.fedoraproject.org/rpms/libunwind
-#
-# The versionned path has a different soname (libunwind.so.1 compared to
-# libunwind.so.8) so they can live together in %%{_libdir}
-#
-# ABI wise, even though llvm-libunwind's library is named libunwind, it doesn't
-# have the exact same ABI as gcc's libunwind (it actually provides a subset).
-rm %{buildroot}%{install_libdir}/libunwind.so
-mkdir -p %{buildroot}/%{install_libdir}/llvm-unwind/
-
-pushd %{buildroot}/%{install_libdir}/llvm-unwind
-ln -s ../libunwind.so.1.0 libunwind.so
-popd
-
-rm %{buildroot}%{_pkgdocdir}/html/.buildinfo
-
-%ldconfig_scriptlets
 %files
-%license libcxx/LICENSE.TXT
+%{_libdir}/libc++*
-%doc libcxx/CREDITS.TXT libcxx/TODO.TXT
+%{_prefix}/include/*
-%{install_libdir}/libc++.so.*
 
 %files devel
-%{install_includedir}/c++/
+%{_includedir}/c++/
-%exclude %{install_includedir}/c++/v1/cxxabi.h
+%{_libdir}/libc++.so
-%exclude %{install_includedir}/c++/v1/__cxxabi_config.h
-%{install_libdir}/libc++.so
-
-%files static
-%license libcxx/LICENSE.TXT
-%{install_libdir}/libc++.a
-%{install_libdir}/libc++experimental.a
-
-%files -n %{?scl_prefix}libcxxabi
-%license libcxxabi/LICENSE.TXT
-%doc libcxxabi/CREDITS.TXT
-%{install_libdir}/libc++abi.so.*
-
-%files -n %{?scl_prefix}libcxxabi-devel
-%{install_includedir}/c++/v1/cxxabi.h
-%{install_includedir}/c++/v1/__cxxabi_config.h
-%{install_libdir}/libc++abi.so
-
-%files -n %{?scl_prefix}libcxxabi-static
-%{install_libdir}/libc++abi.a
-
-%files -n %{?scl_prefix}llvm-libunwind
-%license libunwind/LICENSE.TXT
-%{install_libdir}/libunwind.so.1
-%{install_libdir}/libunwind.so.1.0
-
-%files -n %{?scl_prefix}llvm-libunwind-devel
-%{install_includedir}/llvm-libunwind/__libunwind_config.h
-%{install_includedir}/llvm-libunwind/libunwind.h
-%{install_includedir}/llvm-libunwind/libunwind.modulemap
-%{install_includedir}/llvm-libunwind/mach-o/compact_unwind_encoding.h
-%{install_includedir}/llvm-libunwind/mach-o/compact_unwind_encoding.modulemap
-%{install_includedir}/llvm-libunwind/unwind.h
-%{install_includedir}/llvm-libunwind/unwind_arm_ehabi.h
-%{install_includedir}/llvm-libunwind/unwind_itanium.h
-%dir %{install_libdir}/llvm-unwind
-%{install_libdir}/llvm-unwind/libunwind.so
-
-%files -n %{?scl_prefix}llvm-libunwind-static
-%{install_libdir}/libunwind.a
-
-%files -n %{?scl_prefix}llvm-libunwind-doc
-%license libunwind/LICENSE.TXT
-%doc %{_pkgdocdir}/html
 
 %changelog
-* Fri Dec 6 2024 liyunfei <liyunfei33@huawei.com> - 18.1.8-1
-- init for Multi-Version LLVM-18.1.8
-
-* Thu Nov 07 2024 Funda Wang <fundawang@yeah.net> - 17.0.6-4
-- adopt to new cmake macro
-- force out-of-source build
-
-* Tue Aug 20 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-3
-- Add BiSheng Autotuner support.
-
-* Fri Jul 5 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-2
-- Add toolchain_clang build support
-
-* Tue Dec 5 2023 zhoujing <zhoujing106@huawei.com> - 17.0.6-1
-- update to 17.0.6
-
 * Tue Feb 7 2023 Wang Zehong <wangzehong2@huawei.com> - 12.0.1-1
 - update to 12.0.1-1