Fix bootstrapping glibc

Bootstrapping glibc will disable benchtests, but the if/endif clauses
excluded essentials from the bootstrapped build. Also, mtrace isn't built
when bootstrapping.
This commit is contained in:
Jeroen van Meeuwen (Kolab Systems) 2019-02-17 12:02:24 +01:00
parent 9f81c9aa6e
commit 5b4007bb56

View File

@ -1163,6 +1163,7 @@ cp benchtests/scripts/benchout.schema.json %{glibc_sysroot}%{_prefix}/libexec/gl
cp benchtests/scripts/compare_bench.py %{glibc_sysroot}%{_prefix}/libexec/glibc-benchtests/
cp benchtests/scripts/import_bench.py %{glibc_sysroot}%{_prefix}/libexec/glibc-benchtests/
cp benchtests/scripts/validate_benchout.py %{glibc_sysroot}%{_prefix}/libexec/glibc-benchtests/
%endif # with benchtests
%if 0%{?_enable_debug_packages}
# The #line directives gperf generates do not give the proper
@ -1484,8 +1485,8 @@ cat > utils.filelist <<EOF
%if %{without bootstrap}
%{_prefix}/bin/memusage
%{_prefix}/bin/memusagestat
%endif
%{_prefix}/bin/mtrace
%endif
%{_prefix}/bin/pcprofiledump
%{_prefix}/bin/xtrace
EOF
@ -1517,6 +1518,7 @@ grep '/libnss_[a-z]*\.so$' master.filelist > nss-devel.filelist
grep '/libnsl-[0-9.]*.so$' master.filelist > libnsl.filelist
test $(wc -l < libnsl.filelist) -eq 1
%if %{with benchtests}
###############################################################################
# glibc-benchtests
###############################################################################