Import glibc-2.34-44.fc35 from f35

* Thu Oct 06 2022 Arjun Shankar <arjun@redhat.com> - 2.34-44
- wrap-find-debuginfo.sh: Use nm --format=posix instead of --format=just-symbols

Resolves: #2115831
This commit is contained in:
Arjun Shankar 2022-10-06 17:08:12 +02:00
parent d3604d02a2
commit 591bb6da2e
2 changed files with 5 additions and 2 deletions

View File

@ -148,7 +148,7 @@ end \
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 43%{?dist} Release: 44%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries. # libraries.
@ -2641,6 +2641,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Thu Oct 06 2022 Arjun Shankar <arjun@redhat.com> - 2.34-44
- wrap-find-debuginfo.sh: Use nm --format=posix instead of --format=just-symbols
* Mon Oct 03 2022 Arjun Shankar <arjun@redhat.com> - 2.34-43 * Mon Oct 03 2022 Arjun Shankar <arjun@redhat.com> - 2.34-43
- Remove .annobin* symbols from ld.so (#2126477) - Remove .annobin* symbols from ld.so (#2126477)

View File

@ -136,7 +136,7 @@ done
debug_base_name=${last_arg:-$RPM_BUILD_ROOT} debug_base_name=${last_arg:-$RPM_BUILD_ROOT}
$debugedit -b "$debug_base_name" -d "$debug_dest_name" -n $ldso_path $debugedit -b "$debug_base_name" -d "$debug_dest_name" -n $ldso_path
# Remove the .annobin* symbols (and only them). # Remove the .annobin* symbols (and only them).
if nm --format=just-symbols "$ldso_path" \ if nm --format=posix "$ldso_path" | cut -d' ' -f1 \
| grep '^\.annobin' > "$ldso_tmp.annobin-symbols"; then | grep '^\.annobin' > "$ldso_tmp.annobin-symbols"; then
objcopy --strip-symbols="$ldso_tmp.annobin-symbols" "$ldso_path" objcopy --strip-symbols="$ldso_tmp.annobin-symbols" "$ldso_path"
fi fi