aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2020-01-13 18:27:40 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2020-01-13 18:27:40 +0000
commita5ad6a896c244cdb0745c5828361771eb9166b75 (patch)
tree9ffaf6c942f165f0485e7ed2bed8288a354ee7ab
parent912108f0925faa527af5ab28dfe69bd9db135ffc (diff)
Clean up zstd installation
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11729 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--appendices/dependencies.xml2
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/zstd.xml9
-rw-r--r--general.ent6
4 files changed, 23 insertions, 4 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index efc7c6e1b..cb316cc84 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2786,7 +2786,7 @@
<segtitle>&before;</segtitle>
<seglistitem>
- <seg>Tar</seg>
+ <seg>None</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2faf42ec7..e309c6a83 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2020-01-13</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Ensure zstd libraries are installed in the correct
+ location.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2020-01-12</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/zstd.xml b/chapter06/zstd.xml
index 3b73a9f5d..71e7794b6 100644
--- a/chapter06/zstd.xml
+++ b/chapter06/zstd.xml
@@ -52,6 +52,15 @@
<screen><userinput remap="install">make prefix=/usr install</userinput></screen>
+ <para>Remove the static library and move the shared library to
+ <filename class="directory">/lib</filename>. Also, the
+ <filename class="extension">.so</filename> file in
+ <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
+
+<screen><userinput remap="install">rm -v /usr/lib/libzstd.a
+mv -v /usr/lib/libzstd.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libzstd.so) /usr/lib/libzstd.so</userinput></screen>
+
</sect2>
<sect2 id="contents-zstd" role="content">
diff --git a/general.ent b/general.ent
index c9451df78..e521f7ae1 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20200112">
+<!ENTITY version "SVN-20200113">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20200112-systemd">
+<!ENTITY versiond "20200113-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "January 12th, 2020">
+<!ENTITY releasedate "January 13th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "9.0">