Changeset 8bc83b9

Timestamp:

09/07/2023 03:06:17 PM (9 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

6ae855b

Parents:

f8b6ce0 (diff), 6ad40199 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (2 diffs)
• chapter08/pkgconf.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -40 +40 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2023-09-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Fix an issue in pkgconf-2.0.3 causing
+          BLFS packages fail to build.  Fixes
+          <ulink url='&lfs-ticket-root;5341'>#5341</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

chapter01/whatsnew.xml

@@ -63 +63 @@
       <para>DejaGNU-&dejagnu-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
@@ -168 +168 @@
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>M4-&m4-version;</para>

chapter08/pkgconf.xml

@@ -44 +44 @@
 
     <title>Installation of Pkgconf</title>
-<!--
-    <para>Pkgconf-2.0.0 explicitly errors when attempting to run
-    <option>- -modversion</option> with multiple arguments, even if these
-    arguments are constraints for the same package.  This breaks many
-    packages in BLFS. Run this sed to reinstate the old
-    output for pkgconf:</para>
 
-     <screen><userinput remap="pre">sed -i '1330,1336s|^|//|' cli/main.c</userinput></screen>
--->
+    <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
+    <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
+
+    <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
+
     <para>Prepare Pkgconf for compilation:</para>