rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix conditionals for _enable_debug_packages and benchtests [BZ #1902514]

Browse Source 
Note: valgrind requires either internal or external symbol tables so
it's skipped if we're disabling debug packages, as ld-linux.so is
normally stripped.
This commit is contained in:
DJ Delorie 2020-12-16 16:20:12 -05:00
parent d5ff3061a2
commit 2410c90637
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glibc.spec
View File

@ -96,7 +96,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 22%{?dist} Release: 23%{?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.
@ -1408,7 +1408,6 @@ cp benchtests/scripts/import_bench.py %{glibc_sysroot}%{_prefix}/libexec/glibc-b
cp benchtests/scripts/validate_benchout.py %{glibc_sysroot}%{_prefix}/libexec/glibc-benchtests/ cp benchtests/scripts/validate_benchout.py %{glibc_sysroot}%{_prefix}/libexec/glibc-benchtests/
%endif %endif
%if 0%{?_enable_debug_packages}
# The #line directives gperf generates do not give the proper # The #line directives gperf generates do not give the proper
# file name relative to the build directory. # file name relative to the build directory.
pushd locale pushd locale
@ -1793,6 +1792,7 @@ echo "%{_libdir}/libpthread_nonshared.a" >> compat-libpthread-nonshared.filelist
# glibc-debuginfocommon, and glibc-debuginfo # glibc-debuginfocommon, and glibc-debuginfo
############################################################################### ###############################################################################
%if 0%{?_enable_debug_packages}
find_debuginfo_args='--strict-build-id -g -i' find_debuginfo_args='--strict-build-id -g -i'
%ifarch %{debuginfocommonarches} %ifarch %{debuginfocommonarches}
find_debuginfo_args="$find_debuginfo_args \ find_debuginfo_args="$find_debuginfo_args \
@ -1962,6 +1962,7 @@ run_ldso="$(find %{glibc_sysroot}/%{_lib}/ld-*.so -type f | LC_ALL=C sort | head
# (even if we do not perform the valgrind test). # (even if we do not perform the valgrind test).
LD_SHOW_AUXV=1 $run_ldso /bin/true LD_SHOW_AUXV=1 $run_ldso /bin/true
%if 0%{?_enable_debug_packages}
# Finally, check if valgrind runs with the new glibc. # Finally, check if valgrind runs with the new glibc.
# We want to fail building if valgrind is not able to run with this glibc so # We want to fail building if valgrind is not able to run with this glibc so
# that we can then coordinate with valgrind to get it fixed before we update # that we can then coordinate with valgrind to get it fixed before we update
@ -1973,6 +1974,7 @@ $run_ldso /usr/bin/valgrind --error-exitcode=1 \
$run_ldso /usr/bin/valgrind --error-exitcode=1 \ $run_ldso /usr/bin/valgrind --error-exitcode=1 \
$run_ldso /usr/bin/true --help >/dev/null $run_ldso /usr/bin/true --help >/dev/null
%endif %endif
%endif
%endif %endif
@ -2253,6 +2255,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Wed Dec 16 2020 DJ Delorie <dj@redhat.com> - 2.32.9000-23
- Fix conditionals for _enable_debug_packages and benchtests [BZ #1902514]
* Tue Dec 15 2020 Patsy Griffin <patsy@redhat.com> - 2.32.9000-22 * Tue Dec 15 2020 Patsy Griffin <patsy@redhat.com> - 2.32.9000-22
- Auto-sync with upstream branch master, - Auto-sync with upstream branch master,
commit 4d0985543f479a6f421d4d8a9e0d1dc71c9c2c53. commit 4d0985543f479a6f421d4d8a9e0d1dc71c9c2c53.