Changeset 0ebda11 for chapter08/systemd.xml

Timestamp:

05/14/2021 10:47:43 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

2606939

Parents:

51c01bff

Message:

Remove entities for multilib pathes
Add usage of libc_cv_rtlddir

File:

• chapter08/systemd.xml (modified) (7 diffs)

chapter08/systemd.xml

@@ -52 +52 @@
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
 
+<!-- Seems to be not needed anymore with 248
     <para>Remove tests that cannot be built in chroot:</para>
 
 <screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
+-->
 
     <para>Remove an unneeded group,
@@ -240 +242 @@
     <para>Prepare systemd for compilation:</para>
 
-    <screen><userinput remap="configure">PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
+    <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
 CC="gcc -m32 -march=i686"              \
 CXX="g++ -m32 -march=i686"             \
@@ -257 +259 @@
       -Dmount-path=/bin/mount          \
       -Drootprefix=                    \
-      -Drootlibdir=&usr-lib-m32;          \
+      -Drootlibdir=/usr/lib32          \
       -Dsplit-usr=true                 \
       -Dsulogin-path=/sbin/sulogin     \
@@ -272 +274 @@
 
 <screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR
 rm -f /usr/bin/xsltproc</userinput></screen>
@@ -300 +302 @@
     <para>Prepare systemd for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
+<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
 CC="gcc -mx32"                          \
 CXX="g++ -mx32"                         \
@@ -319 +321 @@
       -Dmount-path=/bin/mount           \
       -Drootprefix=                     \
-      -Drootlibdir=&usr-lib-mx32;          \
+      -Drootlibdir=/usr/libx32          \
       -Dsplit-usr=true                  \
       -Dsulogin-path=/sbin/sulogin      \
@@ -334 +336 @@
 
 <screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR
 rm -f /usr/bin/xsltproc</userinput></screen>