Changeset 0aaf6a31 for chapter06


Ignore:
Timestamp:
03/31/2021 10:41:36 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
9c31d62
Parents:
d7f58cc
git-author:
Thomas Trepl <thomas@…> (10/04/2019 07:22:53 PM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:36 AM)
Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11681 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:
chapter06
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • chapter06/attr.xml

    rd7f58cc r0aaf6a31  
    119119    <para>Prepare Attr for compilation:</para>
    120120
    121 <screen><userinput remap="configure">
    122 CC="gcc -mx32" ./configure \
     121<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    123122    --prefix=/usr          \
    124123    --disable-static       \

  • chapter06/createfiles.xml

    rd7f58cc r0aaf6a31  
    4747ln -sv bash /bin/sh</userinput></screen>
    4848
    49 <screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">
    50 ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
    51 ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32
    52 </userinput>
    53 <userinput arch="ml_x32,ml_all">
    54 ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
     49  <para arch="ml_32,ml_x32,ml_all">32-bit builds also require these links:</para>
     50
     51<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
     52ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32</userinput></screen>
     53
     54  <para arch="ml_x32,ml_all">x32-bit builds also require these links:</para>
     55
     56<screen arch="ml_x32,ml_all"><userinput arch="ml_x32,ml_all">ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
    5557ln -sv /tools/libx32/libstdc++.{a,so{,.6}}         /usr/libx32
    56 ln -sv /usr/libx32 /
    57 </userinput></screen>
     58ln -sv /usr/libx32 /</userinput></screen>
    5859
    5960<!--for lib in blkid lzma mount uuid

  • chapter06/file.xml

    rd7f58cc r0aaf6a31  
    9999    <para>Prepare File for compilation:</para>
    100100
    101 <screen><userinput remap="configure">
    102 CC="gcc -mx32" ./configure \
     101<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    103102    --prefix=/usr          \
    104103    --libdir=/usr/libx32   \

  • chapter06/libtool.xml

    rd7f58cc r0aaf6a31  
    110110    <para>Prepare Libtool for compilation:</para>
    111111
    112 <screen><userinput remap="configure">
    113 CC="gcc -mx32" ./configure \
     112<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    114113    --prefix=/usr          \
    115114    --libdir=/usr/libx32   \

  • chapter06/linux-headers.xml

    rd7f58cc r0aaf6a31  
    5454
    5555    <para>Now extract the user-visible kernel headers from the source.
    56     They are placed in an intermediate local directory and copied to the needed
    57     location because the extraction process removes any existing files in
    58     the target directory.  There are also some hidden files used by
    59     the kernel developers and not needed by LFS that are removed from
    60     the intermediate directory.</para>
    61 
    62 <screen><userinput remap="make">make INSTALL_HDR_PATH=dest headers_install
    63 find dest/include \( -name .install -o -name ..install.cmd \) -delete
    64 </userinput><userinput remap="install">cp -rv dest/include/* /usr/include</userinput></screen>
     56    The recommended make target <quote>headers_install</quote> cannot be
     57    used, because it requires <application>rsync</application>, which is
     58    not available in <filename class="directory">/tools</filename>. The
     59    headers are first placed in <filename class="directory">./usr</filename>,
     60    then some files used by the kernel developers are removed, then
     61    the files are copied to their final location.</para>
     62
     63<screen><userinput remap="make">make headers
     64find usr/include -name '.*' -delete
     65rm usr/include/Makefile
     66</userinput><userinput remap="install">cp -rv usr/include/* /usr/include</userinput></screen>
    6567
    6668  </sect2>

  • chapter06/python.xml

    rd7f58cc r0aaf6a31  
    8484<screen><userinput remap="make">make</userinput></screen>
    8585
    86     <para>The test suite requires TK and and X Windows session and cannot
     86    <para>The test suite requires TK and X Windows session and cannot
    8787    be run until Python 3 is reinstalled in BLFS.</para>
    8888

  • chapter06/systemd.xml

    rd7f58cc r0aaf6a31  
    4141    <title>Installation of systemd</title>
    4242
    43     <para>First, apply a patch to fix issues with systemd-networkd on Linux 5.2+
    44     kernels, as well as with AMD Ryzen CPUs:</para>
    45 
    46 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-networkd_and_rdrand_fixes-1.patch</userinput></screen>
     43    <para>First, apply a patch to fix various bugs since the release
     44    of systemd-243.</para>
     45
     46<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-1.patch</userinput></screen>
    4747
    4848    <para>Create a symlink to work around missing xsltproc:</para>
    … …  
    7171<screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules/50-udev-default.rules.in</userinput></screen>
    7272
    73 <!-- EDITORS NOTE: At the next systemd release, see if the CFLAGS can be removed. -->
    74 
    7573    <para>Prepare systemd for compilation:</para>
    7674
    … …  
    8078PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \
    8179LANG=en_US.UTF-8                   \
    82 CFLAGS+="-Wno-format-overflow"     \
    8380meson --prefix=/usr                \
    8481      --sysconfdir=/etc            \
    … …  
    208205<screen><userinput remap="adjust">systemd-machine-id-setup</userinput></screen>
    209206
    210     <para>Remove symbolic links to Util-Linux libraries:</para>
     207    <para>Setup the basic target structure:</para>
     208
     209<screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
     210
     211    <para>Disable a service that is known to cause problems with systems that
     212    use a network configuration other than what is provided by
     213    systemd-networkd:</para>
     214    <!-- Observed halting startup with dhcpcd handling the primary NIC -->
     215 
     216<screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
     217
     218    <para>Prevent systemd from resetting the maximum PID value which causes
     219    some problems with packages and units in BLFS:</para>
     220    <!-- FCRON in particular -->
     221
     222<screen><userinput remap="adjust">rm -f /etc/sysctl.d/50-pid-max.conf</userinput></screen>
     223
     224    <para>Cleanup symbolic links to Util-Linux libraries:</para>
    211225
    212226<screen><userinput remap="adjust">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>

  • chapter06/xz.xml

    rd7f58cc r0aaf6a31  
    109109    <para>Prepare Xz for compilation:</para>
    110110
    111 <screen><userinput remap="configure">
    112 CC="gcc -mx32" ./configure \
     111<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    113112    --prefix=/usr          \
    114113    --disable-static       \
Note: See TracChangeset for help on using the changeset viewer.