Changeset df2e08c8 for general

Timestamp:

05/28/2024 01:42:49 AM (6 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

trunk

Children:

27040e68

Parents:

cd85943

git-author:

Xi Ruoyao <xry111@…> (05/28/2024 01:19:25 AM)

git-committer:

Xi Ruoyao <xry111@…> (05/28/2024 01:42:49 AM)

Message:

accountsservice: Adapt for GCC 14

File:

• general/sysutils/accountsservice.xml (modified) (2 diffs)

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>