aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06/libcap.xml
diff options
context:
space:
mode:
authorPierre Labastie <pieere@linuxfromscratch.org>2020-01-04 09:00:15 +0000
committerPierre Labastie <pieere@linuxfromscratch.org>2020-01-04 09:00:15 +0000
commit161691d721f1fb721d1a9849f715a46ed997749e (patch)
tree87e7b353188e1e30ff8469e378e4836c0ca533c2 /chapter06/libcap.xml
parent96ef2990d2b5f7fe2ac04ae6f7b8c0510dfa847b (diff)
Fix various issues in libcap-2.29
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11719 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06/libcap.xml')
-rw-r--r--chapter06/libcap.xml35
1 files changed, 11 insertions, 24 deletions
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index 7b6bcabdc..0b8e45aa3 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -43,53 +43,40 @@
<sect2 role="installation">
<title>Installation of Libcap</title>
- <para>Prevent a static library from being installed:</para>
+ <para>Prevent two static libraries from being installed:</para>
-<screen><userinput remap="pre">sed -i '/install.*STALIBNAME/d' libcap/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput></screen>
+
+ <para>Fix a file with wrong syntax:</para>
+
+<screen><userinput remap="pre">sed -i '/libpsx/,$d' libcap/libcap.pc.in</userinput></screen>
<para>Compile the package:</para>
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make lib=lib</userinput></screen>
<para>This package does not come with a test suite.</para>
<para>Install the package:</para>
-<screen><userinput remap="install">make RAISE_SETFCAP=no lib=lib prefix=/usr install
-chmod -v 755 /usr/lib/libcap.so.&libcap-version;</userinput></screen>
+<screen><userinput remap="install">make lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
<variablelist>
<title>The meaning of the make option:</title>
<varlistentry>
- <term><parameter>RAISE_SETFCAP=no</parameter></term>
- <listitem>
- <para>This parameter skips trying to use <command>setcap</command>
- on itself. This avoids an installation error if the kernel or file
- system does not support extended capabilities.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><parameter>lib=lib</parameter></term>
<listitem>
<para>This parameter installs the library in
- <filename>$prefix/lib</filename> rather than
- <filename>$prefix/lib64</filename> on x86_64. It has no effect on
+ <filename>/lib</filename> rather than
+ <filename>/lib64</filename> on x86_64. It has no effect on
x86.</para>
</listitem>
</varlistentry>
</variablelist>
- <para>The shared library needs to be moved to
- <filename class="directory">/lib</filename>, and as a result the
- <filename class="extension">.so</filename> file in
- <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
-
-<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput></screen>
-
</sect2>
<sect2 id="contents-libcap" role="content">