Changeset 0ebda11 for chapter08/util-linux.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/util-linux.xml (modified) (6 diffs)

chapter08/util-linux.xml

@@ -131 +131 @@
             --without-python         \
             --without-systemd        \
-            --libdir=&usr-lib-m32;      \
+            --libdir=/usr/lib32      \
             --host=i686-pc-linux-gnu \
             --without-systemdsystemunitdir \
@@ -148 +148 @@
             --disable-static         \
             --without-python         \
-            --libdir=&usr-lib-m32;      \
+            --libdir=/usr/lib32      \
             --host=i686-pc-linux-gnu \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -159 +159 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -191 +191 @@
             --without-systemd    \
             --without-systemdsystemunitdir \
-            --libdir=&usr-lib-mx32; \
+            --libdir=/usr/libx32 \
             --host=x86_64-pc-linux-gnux32 \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -207 +207 @@
             --disable-static     \
             --without-python     \
-            --libdir=&usr-lib-mx32; \
+            --libdir=/usr/libx32 \
             --host=x86_64-pc-linux-gnux32 \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -218 +218 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>