diff --git a/0001-Build-Static-Library b/0001-Build-Static-Library deleted file mode 100644 index 2efa755c3ab105a6a055adc51c6fa19a43f4df39..0000000000000000000000000000000000000000 --- a/0001-Build-Static-Library +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/glog/CMakeLists.txt b/third_party/glog/CMakeLists.txt -index 2d00c4d..b6b3a1a 100644 ---- a/third_party/glog/CMakeLists.txt -+++ b/third_party/glog/CMakeLists.txt -@@ -34,7 +34,7 @@ include (GenerateExportHeader) - include (GetCacheVariables) - include (GNUInstallDirs) - --option (BUILD_SHARED_LIBS "Build shared libraries" OFF) -+option (BUILD_SHARED_LIBS "Build shared libraries" ON) - option (PRINT_UNSYMBOLIZED_STACK_TRACES - "Print file offsets in traces instead of symbolizing" OFF) - option (WITH_GFLAGS "Use gflags" ON) diff --git a/0001-adjust-the-link-method-of-dependency-libraries.patch b/0001-adjust-the-link-method-of-dependency-libraries.patch new file mode 100644 index 0000000000000000000000000000000000000000..317cf15025f37fd5ccdb0d7ccf99ae47d375a05b --- /dev/null +++ b/0001-adjust-the-link-method-of-dependency-libraries.patch @@ -0,0 +1,39 @@ +From 6693885c1234273bd570d4ee4f4f5856a4df46ea Mon Sep 17 00:00:00 2001 +From: Eric Wang +Date: Wed, 7 Aug 2024 09:12:17 +0800 +Subject: [PATCH] adjust the link method of dependency libraries + +--- + CMakeLists.txt | 2 +- + third_party/glog/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc10c28..808e489 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,7 +3,7 @@ set(CMAKE_CXX_STANDARD 17) + set(ABSL_PROPAGATE_CXX_STD on) + + project(autofdo) +-set (Protobuf_USE_STATIC_LIBS TRUE) ++set (Protobuf_USE_STATIC_LIBS FALSE) + + function (execute_perf_protobuf) + +diff --git a/third_party/glog/CMakeLists.txt b/third_party/glog/CMakeLists.txt +index 846b444..8be869b 100644 +--- a/third_party/glog/CMakeLists.txt ++++ b/third_party/glog/CMakeLists.txt +@@ -34,7 +34,7 @@ include (GenerateExportHeader) + include (GetCacheVariables) + include (GNUInstallDirs) + +-option (BUILD_SHARED_LIBS "Build shared libraries" ON) ++option (BUILD_SHARED_LIBS "Build shared libraries" OFF) + option (PRINT_UNSYMBOLIZED_STACK_TRACES + "Print file offsets in traces instead of symbolizing" OFF) + option (WITH_CUSTOM_PREFIX "Enable support for user-generated message prefixes" ON) +-- +2.39.3 (Apple Git-146) + diff --git a/autofdo-0.19.tar.xz b/autofdo-0.30.1.tar.xz similarity index 64% rename from autofdo-0.19.tar.xz rename to autofdo-0.30.1.tar.xz index 3e56a5a852f0232aba9f20c14428b18be5657d00..531f696aad632fb4220ddc16dad3de4ad26907e1 100644 Binary files a/autofdo-0.19.tar.xz and b/autofdo-0.30.1.tar.xz differ diff --git a/autofdo.spec b/autofdo.spec index 25ab027fdce8c1626b38bcd819aa47db267f472a..b50ecd649403a6d013c5d40a277a82c2a03be3bb 100644 --- a/autofdo.spec +++ b/autofdo.spec @@ -1,14 +1,16 @@ Name: autofdo -Version: 0.19 -Release: 3.20231228.git0e296280 +Version: 0.30.1 +Release: 1 Summary: A tool to convert perf.data profile to AutoFDO profile License: Apache-2.0 URL: https://github.com/google/autofdo # The package in the original url below contains GIT information which is useless, # so remove the GIT information and repackage it. -Source0: %{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz -BuildRequires: gcc gcc-c++ libtool git cmake elfutils-libelf-devel openssl-devel pkg-config ninja-build gtest libunwind-devel protobuf-devel +Patch1: 0001-adjust-the-link-method-of-dependency-libraries.patch + +BuildRequires: gcc gcc-c++ libtool git cmake elfutils-libelf-devel openssl-devel pkg-config ninja-build gtest libunwind-devel protobuf-devel chrpath Requires: glibc openssl-libs elfutils libgcc libstdc++ zlib %description @@ -16,10 +18,10 @@ This package contains a tool to convert perf.data profile to AutoFDO profile that can be used by GCC and LLVM. %prep -%autosetup +%autosetup -p1 %build -cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ./ +cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. -DENABLE_TOOL=GCOV ./ %ninja_build %install @@ -35,8 +37,14 @@ cp %{_builddir}/%{name}-%{version}/profile_merger ./ %{_bindir}/profile_merger %changelog -* Fri Dec 22 2023 zhaozhenyu - 0.19-3.20231228.git0e296280 -- Type:update +* Tue Aug 6 2024 rfwang07 - 0.30.1-1 +- Type:Update +- ID:NA +- SUG:NA +- DESC:Update AutoFDO toolchain to 0.30.1 + +* Fri Dec 22 2023 zhaozhenyu - 0.19-3.20231228.git0e296280 +- Type:Update - ID:NA - SUG:NA - DESC:Update AutoFDO toolchain to 0.19-3.20231228