From d51fe7680c5270ddf8d324bbe11caab6d1e27ade Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 21 Aug 2023 21:44:48 +0100 Subject: gentoo auto-resync : 21:08:2023 - 21:44:47 --- dev-util/bloaty/Manifest | 6 +- dev-util/bloaty/bloaty-1.1-r1.ebuild | 53 +++++++++++++ dev-util/bloaty/bloaty-1.1.ebuild | 3 + dev-util/bloaty/bloaty-9999.ebuild | 20 +++-- .../bloaty/files/bloaty-1.1-system-abseil.patch | 92 ++++++++++++++++++++++ 5 files changed, 167 insertions(+), 7 deletions(-) create mode 100644 dev-util/bloaty/bloaty-1.1-r1.ebuild create mode 100644 dev-util/bloaty/files/bloaty-1.1-system-abseil.patch (limited to 'dev-util/bloaty') diff --git a/dev-util/bloaty/Manifest b/dev-util/bloaty/Manifest index aca5a38c1db5..a4db63af1305 100644 --- a/dev-util/bloaty/Manifest +++ b/dev-util/bloaty/Manifest @@ -1,4 +1,6 @@ +AUX bloaty-1.1-system-abseil.patch 3195 BLAKE2B 3d948e46bfd8dbc8beab110b67792bb2982dd86b400cac374ce8e1d56cbde4ac82e41c69fa98c6a014de7853814c98a368aa3742bb8b17d497a9b2a169cb3ea1 SHA512 e55f15384c9931f1fb66908edf1f577b94b304e4531f470144b21d0d06951af7d0c97f0f51e9c3ddb28641392762c3dbcffff357bc393f57b7ed5579a887df92 DIST bloaty-1.1.tar.bz2 5363836 BLAKE2B a538cf5634ed72844bb128238a521caf375eaab34fd3cce8fdd46002bcbc6c53ba986cc7c1e4b761b1253b2f01cb557c94e1e1585507ff89bec10c891e5f5a88 SHA512 142d0dd58fc0aadce3aee6e9260c6ed792a18cf5fe260c89051d51b9357c7527ba352c3d6c9e23a3494796fba3d88314b6ed8a3a76c6c0d111d4c509cae6b216 -EBUILD bloaty-1.1.ebuild 869 BLAKE2B 73e37a8646558eab61c9f12276c78d8ede35d49e96872e8f223c827386caba5ec26027e2357782ab3391090fe08fda92b24337da6b67f4c05f6745b33c81fd52 SHA512 016d0b54bf01ab03dc5e1695dd943b9ddb0b5e89a1c8f78e4300525af0dabfb382bf8da646d0c981487641fe9692226debcf7a4f739d2cdaf747c06ddc60cc7f -EBUILD bloaty-9999.ebuild 798 BLAKE2B c24d2c676dfcec75c3ee0246877eaa8bc094fb3abf8728af5096090093eaa2e94f4c685bcdb6ed03ef36bc4d70a65e1469e2b8a705792c44aca6994dbd6e0b4b SHA512 f2d7d6f6f09ca7cb021777e5aaf7530e3d69dcb967fe952d4fdf6e0156dad11a75cd3fab0dead023dcc58c8fbfef3be7756a43a78f7f882357f2e3a8a22eed6d +EBUILD bloaty-1.1-r1.ebuild 953 BLAKE2B d2f98425858fbec48fe0e2904f0f73b5818c12bb751baaf64f7c4801efaa480976f92b6cc6f8fd467a9f71f8ff5dc9ec441d7af3db940573886d6d894254657c SHA512 e43736a9b55c444456f1c6701de021f39802382832c7e4fe1ece879caa32e79bb1b75febd5892c6d0c1f4ceb6fe7880d203fc0e67c6ee8d599c3a4478db44748 +EBUILD bloaty-1.1.ebuild 918 BLAKE2B 94566b8bb558a0d512657898cfcbf04f5ea62d472341f78ec39a4551bbda4982315dd379040ded9c1e880e220791ec44d4f39e61bd1982b6d889117d0d9ed24e SHA512 22306a5ddf294ef4bba78df03e74738a4ae25b5e3d9633a62162dae59a7559cb92c8b869760bda38abbf946cfff610ce21d3b4569c43ea33c9d1c376e216b486 +EBUILD bloaty-9999.ebuild 953 BLAKE2B d2f98425858fbec48fe0e2904f0f73b5818c12bb751baaf64f7c4801efaa480976f92b6cc6f8fd467a9f71f8ff5dc9ec441d7af3db940573886d6d894254657c SHA512 e43736a9b55c444456f1c6701de021f39802382832c7e4fe1ece879caa32e79bb1b75febd5892c6d0c1f4ceb6fe7880d203fc0e67c6ee8d599c3a4478db44748 MISC metadata.xml 251 BLAKE2B c9bcdf6e1af4397778332e26ee1e1621e5e1d2fa91efae9b6e9b622d085c20fac131d0fd832a5e305c6fc860b8eed464da69e9a792d4543ac5f215fcab903dce SHA512 97c77c2ecdd499c00d5e7541e0e81bd0ea71632909b6499ccdb0853380edbf1536d87cd743560a88b87a1becb1ed59f31039b8b6510637bf8f55b9ae62add46a diff --git a/dev-util/bloaty/bloaty-1.1-r1.ebuild b/dev-util/bloaty/bloaty-1.1-r1.ebuild new file mode 100644 index 000000000000..e8c0b98fe27a --- /dev/null +++ b/dev-util/bloaty/bloaty-1.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A size profiler for binaries" +HOMEPAGE="https://github.com/google/bloaty" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/google/${PN}" + IUSE="test" + RESTRICT="!test? ( test )" +else + SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm64" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + dev-cpp/abseil-cpp:= + dev-libs/capstone:= + dev-libs/protobuf:= + dev-libs/re2:= +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1-system-abseil.patch +) + +src_configure() { + local mycmakeargs=( + -DBLOATY_ENABLE_CMAKETARGETS=OFF + -DBUILD_SHARED_LIBS=OFF + ) + + if [[ ${PV} == 9999 ]]; then + mycmakeargs+=( + -DBUILD_TESTING=$(usex test) + $(usex test -DINSTALL_GTEST=OFF "") + ) + fi + + cmake_src_configure +} diff --git a/dev-util/bloaty/bloaty-1.1.ebuild b/dev-util/bloaty/bloaty-1.1.ebuild index d72f426425c5..60319810d1f8 100644 --- a/dev-util/bloaty/bloaty-1.1.ebuild +++ b/dev-util/bloaty/bloaty-1.1.ebuild @@ -32,14 +32,17 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 # needed by protobuf -DBLOATY_ENABLE_CMAKETARGETS=OFF -DBUILD_SHARED_LIBS=OFF ) + if [[ ${PV} == 9999 ]]; then mycmakeargs+=( -DBUILD_TESTING=$(usex test) $(usex test -DINSTALL_GTEST=OFF "") ) fi + cmake_src_configure } diff --git a/dev-util/bloaty/bloaty-9999.ebuild b/dev-util/bloaty/bloaty-9999.ebuild index 4aa412ab17d3..e8c0b98fe27a 100644 --- a/dev-util/bloaty/bloaty-9999.ebuild +++ b/dev-util/bloaty/bloaty-9999.ebuild @@ -1,14 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="A size profiler for binaries" HOMEPAGE="https://github.com/google/bloaty" -LICENSE="Apache-2.0" -SLOT="0" if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -17,27 +15,39 @@ if [[ ${PV} == 9999 ]]; then RESTRICT="!test? ( test )" else SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" fi +LICENSE="Apache-2.0" +SLOT="0" + BDEPEND=" virtual/pkgconfig " DEPEND=" + dev-cpp/abseil-cpp:= dev-libs/capstone:= dev-libs/protobuf:= dev-libs/re2:= " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.1-system-abseil.patch +) + src_configure() { local mycmakeargs=( -DBLOATY_ENABLE_CMAKETARGETS=OFF + -DBUILD_SHARED_LIBS=OFF ) + if [[ ${PV} == 9999 ]]; then mycmakeargs+=( -DBUILD_TESTING=$(usex test) + $(usex test -DINSTALL_GTEST=OFF "") ) fi + cmake_src_configure } diff --git a/dev-util/bloaty/files/bloaty-1.1-system-abseil.patch b/dev-util/bloaty/files/bloaty-1.1-system-abseil.patch new file mode 100644 index 000000000000..40a1d2df97ba --- /dev/null +++ b/dev-util/bloaty/files/bloaty-1.1-system-abseil.patch @@ -0,0 +1,92 @@ +https://src.fedoraproject.org/rpms/bloaty/blob/rawhide/f/bloaty-1.1-absl.patch +https://github.com/google/bloaty/pull/347 + +diff -up ./CMakeLists.txt.1 ./CMakeLists.txt +--- ./CMakeLists.txt.1 2020-05-24 00:36:23.000000000 -0400 ++++ ./CMakeLists.txt 2020-12-19 12:32:29.021943521 -0500 +@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0048 NEW) + project (Bloaty VERSION 1.0) + project (Bloaty VERSION 1.1) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) + + # Options we define for users. + option(BLOATY_ENABLE_ASAN "Enable address sanitizer." OFF) +@@ -36,6 +37,8 @@ else(${PKG_CONFIG_FOUND}) + endif(${PKG_CONFIG_FOUND}) + endif(UNIX) + ++find_package(absl) ++ + # Set default build type. + if(NOT CMAKE_BUILD_TYPE) + message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.") +@@ -89,11 +92,10 @@ endif(UNIX) + + include_directories(.) + include_directories(src) +-include_directories(third_party/abseil-cpp) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/src") + + # Baseline build flags. +-set(CMAKE_CXX_FLAGS "-std=c++11 -W -Wall -Wno-sign-compare") ++set(CMAKE_CXX_FLAGS "-W -Wall -Wno-sign-compare") + set(CMAKE_CXX_FLAGS_DEBUG "-g1") + set(CMAKE_CXX_FLAGS_RELEASE "-O2") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g1") +@@ -149,7 +151,7 @@ endif(${PROTOC_FOUND}) + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/bloaty_package.bloaty + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +-add_library(libbloaty ++add_library(libbloaty STATIC + src/bloaty.cc + src/demangle.cc + src/disassemble.cc +@@ -159,6 +161,13 @@ add_library(libbloaty + src/macho.cc + src/range_map.cc + src/webassembly.cc ++) ++ ++if (absl_FOUND) ++ target_link_libraries(libbloaty PUBLIC absl::base absl::strings absl::numeric) ++else() ++ include_directories(third_party/abseil-cpp) ++ target_sources(libbloaty + # Until Abseil has a proper CMake build system + third_party/abseil-cpp/absl/base/internal/raw_logging.cc # Grrrr... + third_party/abseil-cpp/absl/base/internal/throw_delegate.cc +@@ -179,7 +188,8 @@ add_library(libbloaty + third_party/abseil-cpp/absl/types/bad_optional_access.cc + # One source file, no special build system needed. + third_party/demumble/third_party/libcxxabi/cxa_demangle.cpp +- ) ++ ) ++endif() + + if(UNIX) + set(LIBBLOATY_LIBS libbloaty) +@@ -249,9 +259,8 @@ else() + enable_testing() + + if(BUILD_TESTING) +- add_subdirectory(third_party/googletest) +- include_directories(third_party/googletest/googletest/include) +- include_directories(third_party/googletest/googlemock/include) ++ find_package(GTest) ++ pkg_search_module(GMock gmock) + + set(TEST_TARGETS + bloaty_test +@@ -261,7 +270,7 @@ else() + + foreach(target ${TEST_TARGETS}) + add_executable(${target} tests/${target}.cc) +- target_link_libraries(${target} "${LIBBLOATY_LIBS}" gtest_main gmock "${CMAKE_THREAD_LIBS_INIT}") ++ target_link_libraries(${target} "${LIBBLOATY_LIBS}" GTest::Main GTest::GTest ${GMock_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}") + endforeach(target) + + add_executable(fuzz_test tests/fuzz_target.cc tests/fuzz_driver.cc) -- cgit v1.2.3