From caadb46589d2fa5218b98f64181d06e4a8e37261 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 29 Apr 2021 13:17:59 +0200 Subject: [PATCH] Build locales in parallel again Use the hardlink program (now part of util-linux) to normalize the localedef output, so that hardlink groups do not change between builds. --- glibc.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/glibc.spec b/glibc.spec index ab3139a..f71524e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -104,7 +104,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 4%{?dist} +Release: 5%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -1222,14 +1222,14 @@ done %endif # Build and install: -make -j1 install_root=%{glibc_sysroot} install -C build-%{target} - pushd build-%{target} -# Do not use a parallel make here because the hardlink optimization in -# localedef is not fully reproducible when running concurrently. -make install_root=%{glibc_sysroot} \ +%make_build install_root=%{glibc_sysroot} install +%make_build install_root=%{glibc_sysroot} \ install-locales -C ../localedata objdir=`pwd` 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 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 %changelog +* Thu May 6 2021 Florian Weimer - 2.33.9000-5 +- Build locales in parallel again + * Tue May 4 2021 Florian Weimer - 2.33.9000-4 - Various changes to get glibc building again, using selected upstream backports.