metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

Build locales in parallel again

Browse Source 
Use the hardlink program (now part of util-linux) to normalize
the localedef output, so that hardlink groups do not change between
builds.
This commit is contained in:
Florian Weimer 2021-04-29 13:17:59 +02:00
parent 82b682a380
commit caadb46589
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glibc.spec
View File

@ -104,7 +104,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 4%{?dist} Release: 5%{?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.
@ -1222,14 +1222,14 @@ done
%endif %endif
# Build and install: # Build and install:
make -j1 install_root=%{glibc_sysroot} install -C build-%{target}
pushd build-%{target} pushd build-%{target}
# Do not use a parallel make here because the hardlink optimization in %make_build install_root=%{glibc_sysroot} install
# localedef is not fully reproducible when running concurrently. %make_build install_root=%{glibc_sysroot} \
make install_root=%{glibc_sysroot} \
install-locales -C ../localedata objdir=`pwd` install-locales -C ../localedata objdir=`pwd`
popd popd
# Locale creation may produce different groups of hardlinks in an
# unpredictable manner. Re-grouping makes those differences go away.
hardlink %{glibc_sysroot}/usr/lib/locale
# install_different: # install_different:
# Install all core libraries into DESTDIR/SUBDIR. Either the file is # Install all core libraries into DESTDIR/SUBDIR. Either the file is
@ -2310,6 +2310,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 May 6 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-5
- Build locales in parallel again
* Tue May 4 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-4 * Tue May 4 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-4
- Various changes to get glibc building again, using selected upstream - Various changes to get glibc building again, using selected upstream
backports. backports.