Changeset 27040e68

Timestamp:

05/28/2024 02:00:01 AM (5 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

trunk

Children:

0743242

Parents:

7f5ae162 (diff), df2e08c8 (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:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• general/graphlib/aalib.xml (modified) (1 diff)
• general/sysutils/accountsservice.xml (modified) (2 diffs)
• postlfs/security/polkit.xml (modified) (2 diffs)

general/graphlib/aalib.xml

@@ -105 +105 @@
 
     <para>
+      To allow building this package with GCC-14 or later, add some missing
+      <literal>#include</literal> directives and fix a bad
+      <literal>return</literal> statement to make the code C99-compatible.
+      Then regenerate the <command>configure</command> script to ensure
+      the C code for probing system features C99-compatible as well:
+    </para>
+
+<screen><userinput>sed -i '1i#include &lt;stdlib.h&gt;'                            \
+    src/aa{fire,info,lib,linuxkbd,savefont,test,regist}.c &amp;&amp;
+sed -i '1i#include &lt;string.h&gt;'                            \
+    src/aa{kbdreg,moureg,test,regist}.c                   &amp;&amp;
+sed -i '/X11_KBDDRIVER/a#include &lt;X11/Xutil.h&gt;'           \
+    src/aaxkbd.c                                          &amp;&amp;
+sed -i '/rawmode_init/,/^}/s/return;/return 0;/'          \
+    src/aalinuxkbd.c                                      &amp;&amp;
+autoconf</userinput></screen>
+
+    <para>
       Install <application>AAlib</application> by running the following
       commands:

general/sysutils/accountsservice.xml

@@ -144 +144 @@
       -Dadmin_group=adm   \
       -Delogind=true      \
-      -Dsystemdsystemunitdir=no &&
-ninja</userinput></screen>
+      -Dsystemdsystemunitdir=no</userinput></screen>
 
 <screen revision="systemd"><userinput>mkdir build &amp;&amp;
@@ -153 +152 @@
       --prefix=/usr       \
       --buildtype=release \
-      -Dadmin_group=adm   &amp;&amp;
-ninja</userinput></screen>
+      -Dadmin_group=adm</userinput></screen>
+
+    <!-- We have to do this after meson setup because mocklibc is extracted
+         from a tarball by the meson setup command.  -->
+    <para>
+      Now adapt the shipped mocklibc copy to allow building the test suite
+      with GCC 14 or later:
+    </para>
+
+<screen><userinput>grep 'print_indent'     ../subprojects/mocklibc-1.0/src/netgroup.c \
+     | sed 's/ {/;/' >> ../subprojects/mocklibc-1.0/src/netgroup.h &amp;&amp;
+sed -i '1i#include &lt;stdio.h&gt;'                                      \
+    ../subprojects/mocklibc-1.0/src/netgroup.h</userinput></screen>
+
+    <para>
+      Build the package:
+    </para>
+
+    <screen><userinput>ninja</userinput></screen>
 
     <para>

postlfs/security/polkit.xml

@@ -187 +187 @@
       -Dman=true                          \
       -Dsession_tracking=libsystemd-login \
-      -Dtests=true                        &&
-ninja</userinput></screen>
+      -Dtests=true</userinput></screen>
 
 <screen revision="sysv"><userinput>mkdir build &amp;&amp;
@@ -198 +197 @@
       -Dman=true                    \
       -Dsession_tracking=libelogind \
-      -Dtests=true                  &amp;&amp;
-ninja</userinput></screen>
+      -Dtests=true</userinput></screen>
+
+    <!-- We have to do this after meson setup because mocklibc is extracted
+         from a tarball by the meson setup command.  Also note that
+         test/mocklibc is useless and patching it won't work.  -->
+    <para>
+      Now adapt the shipped mocklibc copy to allow building the test suite
+      with GCC 14 or later:
+    </para>
+
+<screen><userinput>grep 'print_indent'     ../subprojects/mocklibc-1.0/src/netgroup.c \
+     | sed 's/ {/;/' >> ../subprojects/mocklibc-1.0/src/netgroup.h &amp;&amp;
+sed -i '1i#include &lt;stdio.h&gt;'                                      \
+    ../subprojects/mocklibc-1.0/src/netgroup.h</userinput></screen>
+
+    <para>
+      Build the package:
+    </para>
+
+<screen><userinput>ninja</userinput></screen>
 
     <para>