diff --git a/0001-PATCH-libcxx-Remove-monorepo-requirement.patch b/0001-PATCH-libcxx-Remove-monorepo-requirement.patch deleted file mode 100644 index 09b819e..0000000 --- a/0001-PATCH-libcxx-Remove-monorepo-requirement.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fc46c464795f965c4cdbc321058f24191af8e40c Mon Sep 17 00:00:00 2001 -From: Tom Stellard -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 diff --git a/0001-libcxx-Remove-monorepo-requirement.patch b/0001-libcxx-Remove-monorepo-requirement.patch deleted file mode 100644 index cc14dda..0000000 --- a/0001-libcxx-Remove-monorepo-requirement.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 89a9306a9c24b192b9fac3b7498661428676af0e Mon Sep 17 00:00:00 2001 -From: wangzehong -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 diff --git a/libcxx.spec b/libcxx.spec index 87322ed..1b9554f 100644 --- a/libcxx.spec +++ b/libcxx.spec @@ -1,6 +1,7 @@ %bcond_without sys_llvm %bcond_without check %bcond_without toolchain_clang +%bcond_without bisheng_autotuner %if %{with toolchain_clang} %global toolchain clang @@ -38,7 +39,7 @@ Name: %{pkg_name} Version: %{libcxx_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: LLVM "libcxx" runtime libraries License: Apache-2.0 URL: http://llvm.org @@ -184,6 +185,9 @@ export ASMFLAGS=$CFLA %if "%{toolchain}" == "clang" -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ +%endif +%if %{with bisheng_autotuner} + -DLLVM_ENABLE_AUTOTUNER=ON \ %endif .. @@ -265,6 +269,9 @@ rm %{buildroot}%{_pkgdocdir}/html/.buildinfo %doc %{_pkgdocdir}/html %changelog +* Tue Aug 20 2024 liyunfei - 17.0.6-3 +- Add BiSheng Autotuner support. + * Fri Jul 5 2024 liyunfei - 17.0.6-2 - Add toolchain_clang build support