Changeset d45f50d

Timestamp:

11/01/2022 03:05:05 AM (18 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/update-glibc

Children:

2828b85, 6586901, 6dfe1df, 8c586d2

Parents:

3f43049

git-author:

Xi Ruoyao <xry111@…> (11/01/2022 02:47:28 AM)

git-committer:

Xi Ruoyao <xry111@…> (11/01/2022 03:05:05 AM)

Message:

glibc: fix parallel build issue with make-4.4

We only need a one-line change in upstream fix (because we don't use
"make --shuffle"). Add it as a sed for both Chapter 5 and Chapter 8.

Note that the "minimal" sed would be '/MAEKFLAGS :=/s/r/ -r/'. I
included an additional ')' so it won't modify "-r" again to "- -r".

Tested "make" and "make check" on a x86_64 with -j8 and an arm64 with
-j24.

Link: ​https://sourceware.org/git/?p=glibc.git;a=commit;h=2d7ed98add14

Files:

• chapter05/glibc.xml (modified) (1 diff)
• chapter08/glibc.xml (modified) (2 diffs)

chapter05/glibc.xml

@@ -65 +65 @@
     </note>
 
+    <para>Fix an issue building Glibc with parallel jobs and make-4.4
+    or later:</para>
+
+<screen><userinput remap="pre">sed '/MAKEFLAGS :=/s/)r/) -r/' -i Makerules</userinput></screen>
+
     <para>Some of the Glibc programs use the non-FHS-compliant
     <filename class="directory">/var/db</filename> directory to store their

chapter08/glibc.xml

@@ -44 +44 @@
     <title>Installation of Glibc</title>
 
-<!-- applied in 2.35 (commit b805aebd42364fe696e417808a700fdb9800c9e8)
-    <para>First, fix a security problem identified upstream:</para>
-
-    <screen><userinput remap="pre">sed -e '/NOTIFY_REMOVED)/s/)/ \&amp;\&amp; data.attr != NULL)/' \
-    -i sysdeps/unix/sysv/linux/mq_notify.c</userinput></screen>
--->
+    <para>First, fix an issue building Glibc with parallel jobs and make-4.4
+    or later:</para>
+
+<screen><userinput remap="pre">sed '/MAKEFLAGS :=/s/)r/) -r/' -i Makerules</userinput></screen>
+
     <para>Some of the Glibc programs use the non-FHS compliant
     <filename class="directory">/var/db</filename> directory to store
@@ -128 +127 @@
     <para>Compile the package:</para>
 
-<!-- With make-4.4, glibc consistently failed at -j22, but passed at -j1.
-     I will inverstigate to see if I can find a better alternative.
-     It seems like a race condition. -->
-<screen><userinput remap="make">make -j1</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
 
     <important>