commit:     86eded1c04bd633e46d65449a4dc063579caadd6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 31 20:44:55 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 31 20:44:55 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=86eded1c

estrip: adjust build ID adjustment for splitdebug w/ FEATURES=-installsources

Some deduplication here is probably a good idea. But let's get this minimal
fix out first.

Bug: https://bugs.gentoo.org/968220
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/estrip | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/estrip b/bin/estrip
index 590e40f76e..bc6071f8fb 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -168,6 +168,12 @@ save_elf_debug() {
                                        buildid=$("${name_of[debugedit]}" -i \
                                                -s "${CATEGORY}/${PF}:${SLOT}" \
                                                "${src}")
+
+                                       # We need to process the splitdebug 
file too
+                                       # if we're doing it at this late 
juncture (bug #968220)
+                                       "${name_of[debugedit]}" -i \
+                                               -s "${CATEGORY}/${PF}:${SLOT}" \
+                                               "${dst}"
                                elif ! contains_word buildid 
"${warned_for[debugedit]}"; then
                                        warned_for[debugedit]+=" buildid"
                                        stash_warning <<-'EOF'

Reply via email to