Skip to content

Commit

Permalink
binutils: Update to latest and update configs (#4575)
Browse files Browse the repository at this point in the history
Changes:
- Link against jansson to enable ELF_PACKAGE_METADATA
- Default to compressing debug symbols and set default compression
algorithm to zstd
- Use BLAKE3 for hashing when using the --build-id=md5 or
--build-id=sha1 flags
- Switch to RUNPATH over RPATH
- Add `--with-zstd` flag so the build fails if somehow it can't use zstd
(really important now)
- Fix gprofng stateless
- Move gprofng shared libs back into main binutils package
- Split out the devel files to -devel
  • Loading branch information
ReillyBrogan authored Dec 16, 2024
2 parents 36aeef7 + d3705d4 commit b05eb1e
Show file tree
Hide file tree
Showing 12 changed files with 507 additions and 60 deletions.
2 changes: 2 additions & 0 deletions packages/b/binutils/abi_used_libs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
UNKNOWN
ld-linux-x86-64.so.2
libblake3.so.0
libc.so.6
libgcc_s.so.1
libjansson.so.4
libstdc++.so.6
libz.so.1
libzstd.so.1
5 changes: 5 additions & 0 deletions packages/b/binutils/abi_used_symbols
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
UNKNOWN:_ZTVN10__cxxabiv117__class_type_infoE
UNKNOWN:_ZTVN10__cxxabiv120__si_class_type_infoE
ld-linux-x86-64.so.2:__tls_get_addr
libblake3.so.0:blake3_hasher_finalize
libblake3.so.0:blake3_hasher_init
libblake3.so.0:blake3_hasher_update
libc.so.6:__asprintf_chk
libc.so.6:__assert_fail
libc.so.6:__ctype_b_loc
Expand Down Expand Up @@ -288,6 +291,8 @@ libc.so.6:waitpid
libc.so.6:write
libgcc_s.so.1:_Unwind_Resume
libgcc_s.so.1:__gcc_personality_v0
libjansson.so.4:json_delete
libjansson.so.4:json_loads
libstdc++.so.6:_ZNKSt13runtime_error4whatEv
libstdc++.so.6:_ZNKSt5ctypeIcE13_M_widen_initEv
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEcm
Expand Down
42 changes: 42 additions & 0 deletions packages/b/binutils/files/0001-Proper-stateless.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Reilly Brogan <[email protected]>
Date: Fri, 13 Dec 2024 12:42:26 -0600
Subject: [PATCH] Proper stateless

---
gprofng/src/Settings.cc | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gprofng/src/Settings.cc b/gprofng/src/Settings.cc
index 6d1d357a17..d62c5fdacb 100644
--- a/gprofng/src/Settings.cc
+++ b/gprofng/src/Settings.cc
@@ -413,13 +413,22 @@ Settings::read_rc (bool ipc_or_rdt_mode)
rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), sysconfdir);
if (access (rc_path, R_OK | F_OK) != 0)
{
- StringBuilder sb;
- sb.sprintf (GTXT ("Warning: Default gprofng.rc file (%s) missing; configuration error "), rc_path);
- Emsg *m = new Emsg (CMSG_COMMENT, sb);
- app->get_comments_queue ()->append (m);
+ free (rc_path);
+ // Read vendor file
+ const char *vendordir = getenv("GPROFNG_VENDORDIR");
+ if (vendordir == NULL)
+ vendordir = "/usr/share/defaults/gprofng";
+ rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), vendordir);
+ if (access (rc_path, R_OK | F_OK) != 0)
+ {
+ StringBuilder sb;
+ sb.sprintf (GTXT ("Warning: Default gprofng.rc file (%s) missing; configuration error "), rc_path);
+ Emsg *m = new Emsg (CMSG_COMMENT, sb);
+ app->get_comments_queue ()->append (m);
+ }
+ else
+ set_rc (rc_path, false, app->get_comments_queue (), override);
}
- else
- set_rc (rc_path, false, app->get_comments_queue (), override);
free (rc_path);
is_loexpand_default = true;
if (str_printmode == NULL)
Loading

0 comments on commit b05eb1e

Please sign in to comment.