[lfsja-git] r11.0-163 対応。

diff --git a/configure b/configure
index 918560a..98f971c 100755 (executable)
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
 
 
 
-TARGETVER=r11.0-161
+TARGETVER=r11.0-163
 if test "x$revspec" = "xsystemd"; then
   TARGETVER="$TARGETVER-systemd"
 fi

diff --git a/src/appendices/dependencies.ch b/src/appendices/dependencies.ch
index 950adfb..0642dae 100644 (file)
--- a/src/appendices/dependencies.ch
+++ b/src/appendices/dependencies.ch
@@ -1936,9 +1936,9 @@
           <seg>Kmod</seg>
 @z
 @x
-          <seg>None</seg>
+            <ulink url="&blfs-book;general/glib2.html">Glib2</ulink>
 @y
-          <seg>なし</seg>
+            <ulink url="&blfs-book;general/glib2.html">Glib2</ulink>
 @z
 
 %----------------------------------------------------------------------

diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index 11f93fa..4f2d060 100644 (file)
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,25 @@
 @z
 
 @x
+      <para>2022-02-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Workaround the issue causing binaries link to
+          libraries from the host distro for pass 2 binutils.  It's now
+          unnecessary to build zlib in chapter 6.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2022-02-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - 2 回めの binutils において、ホストのライブラリにバイナリがリンクされてしまう問題を回避。
+          第 6 章において zlib をビルドする必要がなくなる。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2022-02-09</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index 191d64a..3e37f4d 100644 (file)
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,17 @@
 
 -->
    <listitem>
+      <para>2022-02-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r11.0-163 (<ulink url="&lfs-changeset;426913ea0">426913ea0</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2022-02-10</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter06/Makefile.am b/src/chapter06/Makefile.am
index 8850b17..9b64d25 100644 (file)
--- a/src/chapter06/Makefile.am
+++ b/src/chapter06/Makefile.am
@@ -21,8 +21,7 @@ CHANGE_FILES = \
        patch.ch          \
        sed.ch            \
        tar.ch            \
-       xz.ch             \
-       zlib.ch
+       xz.ch
 
 EXTRA_DIST = $(CHANGE_FILES)
 srcdir = @srcdir@

diff --git a/src/chapter06/Makefile.in b/src/chapter06/Makefile.in
index 07a5972..3dac45a 100644 (file)
--- a/src/chapter06/Makefile.in
+++ b/src/chapter06/Makefile.in
@@ -254,8 +254,7 @@ CHANGE_FILES = \
        patch.ch          \
        sed.ch            \
        tar.ch            \
-       xz.ch             \
-       zlib.ch
+       xz.ch
 
 EXTRA_DIST = $(CHANGE_FILES)
 srcs = $(CHANGE_FILES:.ch=.xml)

diff --git a/src/chapter06/binutils-pass2.ch b/src/chapter06/binutils-pass2.ch
index 7d2bccd..e64db18 100644 (file)
--- a/src/chapter06/binutils-pass2.ch
+++ b/src/chapter06/binutils-pass2.ch
@@ -34,6 +34,18 @@
 @z
 
 @x
+    <para>Binutils ships an outdated libtool copy in the tarball.  It lacks
+    sysroot support so the produced binaries will be mistakenly linked to
+    libraries from the host distro.  Workaround this issue:</para>
+@y
+    <para>
+    Binutils の tarball では、古い libtool のコピーが提供されています。
+    これは sysroot サポートが行われていないので、ビルドされるバイナリが誤ってホストディストロのライブラリにリンクされてしまいます。
+    この問題を以下により回避します。
+    </para>
+@z
+
+@x
     <para>Create a separate build directory again:</para>
 @y
     <para>
@@ -127,15 +139,10 @@
 @z
 
 @x
-    <para>Install the package, and
-    workaround an issue causing
-    <filename class="libraryfile">libctf.so</filename>
-    to link against zlib from the host distribution:</para>
+    <para>Install the package:</para>
 @y
     <para>
     &InstallThePackage;
-    またホストディストリビューションの zlib に対して <filename
-    class="libraryfile">libctf.so</filename> がリンクしてしまう問題を回避します。
     </para>
 @z
 

diff --git a/src/chapter06/zlib.ch b/src/chapter06/zlib.ch
deleted file mode 100644 (file)
index fd67a1f..0000000
--- a/src/chapter06/zlib.ch
+++ /dev/null
@@ -1,44 +0,0 @@
-%
-% This is part of LFSbookja package.
-%
-% This is a CTIE change file for the original XML source of the LFSbook.
-%
-@x
-<?xml version="1.0" encoding="ISO-8859-1"?>
-@y
-<?xml version="1.0" encoding="UTF-8"?>
-@z
-
-@x
-    <title>Installation of Zlib</title>
-@y
-    <title>&InstallationOf1;Zlib&InstallationOf2;</title>
-@z
-
-@x
-    <para>Prepare Zlib for compilation:</para>
-@y
-    <para>&PreparePackage1;Zlib&PreparePackage2;</para>
-@z
-
-@x
-    <para>Compile the package:</para>
-@y
-    <para>&CompileThePackage;</para>
-@z
-
-@x
-    <para>Install the package:</para>
-@y
-    <para>&InstallThePackage;</para>
-@z
-
-@x
-     <para>Details on this package are located in 
-       <xref linkend="contents-zlib" role="."/>
-     </para>
-@y
-     <para>
-     &Details1;<xref linkend="contents-zlib" role=""/>&Details2;
-     </para>
-@z

diff --git a/src/general.ch b/src/general.ch
index fc541f8..5181799 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
 <!ENTITY copyrightdate   "%crdate;">
 ]]>
 
-<!ENTITY jversion        "20220210">
-<!ENTITY jversiond       "20220210">
-<!ENTITY jcorrespondSHA  "9c4ff70ed"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY jversion        "20220211">
+<!ENTITY jversiond       "20220211">
+<!ENTITY jcorrespondSHA  "426913ea0"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z

diff --git a/version.ac b/version.ac
index dfd10e0..a5f28d0 100644 (file)
--- a/version.ac
+++ b/version.ac
@@ -2,4 +2,4 @@ dnl
 dnl  This is part of LFSbookja package.
 dnl 
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [r11.0-161])
+m4_define([lfs_version], [r11.0-163])