Compare commits

..

1 Commits
rawhide ... f33

Author SHA1 Message Date
Rich Mattes 61569a728c Rebuild for abseil-cpp-20200225.3 2020-12-19 12:53:53 -05:00
3 changed files with 14 additions and 152 deletions

View File

@ -1,21 +0,0 @@
From 7611debaa6459e66b95e03937a2573316e42b69e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 26 Jan 2023 08:25:54 -0500
Subject: [PATCH] Add missing #include needed on GCC13
---
tests/fuzz_driver.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/fuzz_driver.cc b/tests/fuzz_driver.cc
index 4980317..3f0ce70 100644
--- a/tests/fuzz_driver.cc
+++ b/tests/fuzz_driver.cc
@@ -13,6 +13,7 @@
// limitations under the License.
#include <cassert>
+#include <cstdint>
#include <iostream>
#include <fstream>
#include <vector>

View File

@ -1,17 +1,7 @@
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})
+++ ./CMakeLists.txt 2020-05-26 21:06:16.035802108 -0400
@@ -36,6 +36,8 @@ else(${PKG_CONFIG_FOUND})
endif(${PKG_CONFIG_FOUND})
endif(UNIX)
@ -20,7 +10,7 @@ diff -up ./CMakeLists.txt.1 ./CMakeLists.txt
# 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)
@@ -89,7 +91,6 @@ endif(UNIX)
include_directories(.)
include_directories(src)
@ -28,21 +18,7 @@ diff -up ./CMakeLists.txt.1 ./CMakeLists.txt
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
@@ -159,6 +160,13 @@ add_library(libbloaty
src/macho.cc
src/range_map.cc
src/webassembly.cc
@ -56,7 +32,7 @@ diff -up ./CMakeLists.txt.1 ./CMakeLists.txt
# 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
@@ -179,7 +187,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
@ -66,7 +42,7 @@ diff -up ./CMakeLists.txt.1 ./CMakeLists.txt
if(UNIX)
set(LIBBLOATY_LIBS libbloaty)
@@ -249,9 +259,8 @@ else()
@@ -249,9 +258,8 @@ else()
enable_testing()
if(BUILD_TESTING)
@ -78,7 +54,7 @@ diff -up ./CMakeLists.txt.1 ./CMakeLists.txt
set(TEST_TARGETS
bloaty_test
@@ -261,7 +270,7 @@ else()
@@ -261,7 +269,7 @@ else()
foreach(target ${TEST_TARGETS})
add_executable(${target} tests/${target}.cc)

View File

@ -1,32 +1,16 @@
Name: bloaty
Version: 1.1
Release: 28%{?dist}
Release: 5%{?dist}
Summary: A size profiler for binaries
# The entire source is Apache-2.0, except:
#
# BSD-2-Clause:
# third_party/freebsd_elf/
# APSL-2.0:
# third_party/darwin_xnu_macho/ except as below:
# APSL-2.0 AND BSD-4-Clause-UC:
# third_party/darwin_xnu_macho/mach-o/nlist.h
# APSL-2.0 AND BSD-3-Clause
# third_party/darwin_xnu_macho/mach-o/reloc.h
#
# Note that the contents of third_party/freebsd_elf/ and
# third_party/darwin_xnu_macho/ *are* used in the Linux build (to support
# examining binaries built for other platforms).
License: Apache-2.0 AND BSD-2-Clause AND BSD-4-Clause-UC AND BSD-3-Clause
License: ASL 2.0
URL: https://github.com/google/bloaty
Source0: https://github.com/google/bloaty/archive/v%{version}/%{name}-%{version}.tar.gz
# Patch to use system versions of abseil, google-test and google-mock
Patch0: bloaty-1.1-absl.patch
# Patch to fix size detection function to use 64 bit types on 32bit architectures
Patch1: bloaty-1.1-longlong.patch
# Add missing #include needed on GCC13
# https://github.com/google/bloaty/pull/332
Patch2: %{url}/pull/332.patch
BuildRequires: abseil-cpp-devel
BuildRequires: capstone-devel
@ -38,8 +22,6 @@ BuildRequires: pkgconfig
BuildRequires: protobuf-devel
BuildRequires: re2-devel
BuildRequires: help2man
%description
Ever wondered what's making your binary big? Bloaty McBloatface will show
you a size profile of the binary so you can understand what's taking up
@ -50,23 +32,20 @@ libraries. Bloaty supports the ELF and Mach-O formats, and has experimental
support for WebAssembly.
%prep
%autosetup -S gendiff -N
%autopatch -p0 -M 1
%autopatch -p1 -m 2
%autosetup -p0 -S gendiff
%build
%cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_SHARED_LIBS=OFF \
-DBLOATY_ENABLE_CMAKETARGETS=OFF \
-DBUILD_TESTING=ON
%cmake_build
help2man --no-info --output=bloaty.1 %{_vpath_builddir}/bloaty
%install
%cmake_install
install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 bloaty.1
%check
%ctest --verbose || exit 0
@ -75,83 +54,11 @@ install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 bloaty.1
%license LICENSE
%doc README.md how-bloaty-works.md
%{_bindir}/bloaty
%{_mandir}/man1/bloaty.1*
%changelog
* Sat Feb 24 2024 Paul Wouters <paul.wouters@aiven.io> - 1.1-28
- Rebuilt for libre2.so.11 bump
* Sun Feb 04 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1.1-27
- Rebuild for abseil-cpp-20240116.0
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Nov 14 2023 Rich Mattes <richmattes@gmail.com> - 1.1-24
- Rebuild for capstone-5.0.1
* Fri Sep 01 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.1-23
- Update License to SPDX
- Stop using deprecated %%patchN macros
- Add an automatically-generated man page
* Wed Aug 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.1-22
- Rebuilt for abseil-cpp 20230802.0
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Mar 27 2023 Rich Mattes <richmattes@gmail.com> - 1.1-20
- Rebuild for abseil-cpp-20230125.1
* Thu Jan 26 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 1.1-19
- Patch for GCC 13
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Aug 23 2022 Rich Mattes <richmattes@gmail.com> - 1.1-17
- Rebuilt for abseil-cpp 20220623.0
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Mar 09 2022 Rich Mattes <richmattes@gmail.com> - 1.1-15
- Rebuild for abseil-cpp 20211102.0
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 1.1-13
- Rebuilt for libre2.so.9
* Sun Nov 07 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.1-12
- rebuild for new protobuf
* Sun Oct 24 2021 Adrian Reber <adrian@lisas.de> - 1.1-11
- Rebuilt for protobuf 3.18.1
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jun 10 2021 Rich Mattes <richmattes@gmail.com> - 1.1-9
- Rebuild for abseil-cpp-20210324.2
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 13 08:55:29 CET 2021 Adrian Reber <adrian@lisas.de> - 1.1-7
- Rebuilt for protobuf 3.14
* Sat Dec 19 11:31:29 EST 2020 Rich Mattes <richmattes@gmail.com> - 1.1-6
- Rebuild for abseil-cpp 20200923.2
* Wed Sep 23 2020 Adrian Reber <adrian@lisas.de> - 1.1-5
- Rebuilt for protobuf 3.13
* Sat Dec 19 12:53:37 EST 2020 Rich Mattes <richmattes@gmail.com> - 1.1-5
- Rebuild for abseil-cpp-20200225.3
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-4
- Second attempt - Rebuilt for