diff --git a/sys-apps/autofdo/autofdo-0.30.1.ebuild b/sys-apps/autofdo/autofdo-0.30.1.ebuild index f4249e9..07ae39d 100644 --- a/sys-apps/autofdo/autofdo-0.30.1.ebuild +++ b/sys-apps/autofdo/autofdo-0.30.1.ebuild @@ -12,9 +12,9 @@ PERF_DC_VER="b665ecebcb0f14988408036422ac114cade65a7c" SRC_URI=" https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSEIL_VER}.tar.gz - https://github.com/google/glog/archive/refs/tags/v${GLOG_VER}.tar.gz https://github.com/google/perf_data_converter/archive/${PERF_DC_VER}.zip " + # https://github.com/google/glog/archive/refs/tags/v${GLOG_VER}.tar.gz LICENSE="" SLOT="0" @@ -26,15 +26,21 @@ REQUIRED_USE=" || ( llvm gcov ) " +DEPEND=" + dev-cpp/glog[gflags] +" + PATCHES=( - "${FILESDIR}/protobuf-patch.patch" + "${FILESDIR}/01-protobuf-dep.patch" + "${FILESDIR}/02-system-glog.patch" + "${FILESDIR}/03-system-gflags.patch" ) src_unpack() { default mv ${WORKDIR}/abseil-cpp-${ABSEIL_VER}/* ${S}/third_party/abseil/ - mv ${WORKDIR}/glog-${GLOG_VER}/* ${S}/third_party/glog/ + # mv ${WORKDIR}/glog-${GLOG_VER}/* ${S}/third_party/glog/ mv ${WORKDIR}/perf_data_converter-${PERF_DC_VER}/* ${S}/third_party/perf_data_converter/ } diff --git a/sys-apps/autofdo/files/protobuf-dep.patch b/sys-apps/autofdo/files/01-protobuf-dep.patch similarity index 100% rename from sys-apps/autofdo/files/protobuf-dep.patch rename to sys-apps/autofdo/files/01-protobuf-dep.patch diff --git a/sys-apps/autofdo/files/system-glog.patch b/sys-apps/autofdo/files/02-system-glog.patch similarity index 95% rename from sys-apps/autofdo/files/system-glog.patch rename to sys-apps/autofdo/files/02-system-glog.patch index d428e06..21e9f05 100644 --- a/sys-apps/autofdo/files/system-glog.patch +++ b/sys-apps/autofdo/files/02-system-glog.patch @@ -17,7 +17,7 @@ index dc10c28..52acfb0 100644 ${PROJECT_BINARY_DIR}/third_party/glog ${PROJECT_BINARY_DIR}/third_party/perf_data_converter/src/quipper) -+ find_package (LIBGLOG_LIBRARIES NAMES glog REQUIRED) ++ find_package (glog REQUIRED) find_library (LIBELF_LIBRARIES NAMES elf REQUIRED) find_library (LIBCRYPTO_LIBRARIES NAMES crypto REQUIRED) diff --git a/sys-apps/autofdo/files/03-system-gflags.patch b/sys-apps/autofdo/files/03-system-gflags.patch new file mode 100644 index 0000000..22cf065 --- /dev/null +++ b/sys-apps/autofdo/files/03-system-gflags.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc3fc0b..5fbe6d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,7 @@ function (build_gcov) + ${PROJECT_BINARY_DIR}/third_party/perf_data_converter/src/quipper) + + find_package (glog REQUIRED) ++ find_package (gflags REQUIRED) + find_library (LIBELF_LIBRARIES NAMES elf REQUIRED) + find_library (LIBCRYPTO_LIBRARIES NAMES crypto REQUIRED) + +@@ -90,6 +91,7 @@ function (build_gcov) + absl::flags_parse + create_gcov_lib + glog::glog ++ gflags::gflags + quipper_perf + ) + +@@ -111,6 +113,7 @@ function (build_gcov) + absl::flags_parse + profile_merger_lib + glog::glog ++ gflags::gflags + quipper_perf + ) + +@@ -129,7 +132,9 @@ function (build_gcov) + absl::flags + absl::flags_parse + dump_gcov_lib +- glog::glog) ++ glog::glog ++ gflags::gflags ++ ) + + endfunction() +