Changeset e8c3099

Timestamp:

11/17/2020 02:50:35 PM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

bfe0b0b

Parents:

9d9c3fd

Message:

Adapt libcap instruction to the new libpsx.so shared library (was only static
before)

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12061 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter08/libcap.xml (modified) (3 diffs)

chapter08/libcap.xml

@@ -44 +44 @@
     <title>Installation of Libcap</title>
 
-    <para>Prevent a static library from being installed:</para>
+    <para>Prevent static libraries from being installed:</para>
 
-<screen><userinput remap="pre">sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install -m.*STA/d' libcap/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
@@ -73 +73 @@
 
 <screen><userinput remap="install">make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install
-chmod -v 755 /lib/libcap.so.&libcap-version;
-mv -v /lib/libpsx.a /usr/lib
-rm -v /lib/libcap.so
-ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
+for libname in cap psx; do
+    chmod -v 755 /lib/lib${libname}.so.&libcap-version;
+    rm -v /lib/lib${libname}.so
+    ln -sfv ../../lib/lib${libname}.so.2 /usr/lib/lib${libname}.so
+done</userinput></screen>
 
   </sect2>
@@ -89 +90 @@
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.so and libpsx.a</seg>
+        <seg>libcap.so and libpsx.so</seg>
       </seglistitem>
     </segmentedlist>