Changeset d9bec1e


Ignore:
Timestamp:
03/17/2022 02:28:37 PM (6 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
02c702c
Parents:
5ffa04b (diff), cc2c231 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • chapter01/changelog.xml

    r5ffa04b rd9bec1e  
    4242
    4343    <listitem>
     44      <para>2022-03-02</para>
     45      <itemizedlist>
     46        <listitem>
     47          <para>[xry111] - Update to meson-0.61.2. Fixes
     48          <ulink url="&lfs-ticket-root;5013">#5013</ulink>.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[xry111] - Update to linux-5.16.12. Fixes
     52          <ulink url="&lfs-ticket-root;5014">#5014</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[xry111] - Update to MarkupSafe-2.1.0. Fixes
     56          <ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[xry111] - Update to dbus-1.14.0. Fixes
     60          <ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[xry111] - Update to vim-8.2.4489 (security fixes).
     64          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[xry111] - Build libstdc++ in GCC pass 2, and remove the
     68          seperate libstdc++ pass 2.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[xry111] - Remove unneeded
     72          <parameter>--enable-64bit</parameter> for tcl.</para>
     73        </listitem>
     74      </itemizedlist>
     75    </listitem>
     76
     77    <listitem>
    4478      <para>2022-03-01</para>
    4579      <itemizedlist>
  • chapter01/whatsnew.xml

    r5ffa04b rd9bec1e  
    1212  <title>What's new since the last release</title>
    1313
    14   <para>In this version of LFS, there has been a major reorganization
    15   of the book using techniques that avoid changing the host system
    16   and provides a more straight forward build process.</para>
    17 
    1814  <para>Below is a list of package updates made since the previous
    1915  release of the book.</para>
     
    4036      <para>Autoconf-&autoconf-version;</para>
    4137    </listitem>-->
    42     <listitem>
     38   <!--<listitem>
    4339      <para>Automake-&automake-version;</para>
    44     </listitem>
    45     <listitem>
     40    </listitem>-->
     41   <!--<listitem>
    4642      <para>Bash &bash-version;</para>
    47     </listitem>
    48     <listitem>
     43    </listitem>-->
     44   <!--<listitem>
    4945      <para>Bc &bc-version;</para>
    50     </listitem>
    51     <listitem>
     46    </listitem>-->
     47   <!--<listitem>
    5248      <para>Binutils-&binutils-version;</para>
    53     </listitem>
    54     <listitem>
     49    </listitem>-->
     50   <!--<listitem>
    5551      <para>Bison-&bison-version;</para>
    56     </listitem>
     52    </listitem>-->
    5753    <!--<listitem>
    5854      <para>Bzip2-&bzip2-version;</para>
     
    6157      <para>Check-&check-version;</para>
    6258    </listitem>-->
    63     <listitem>
     59    <!--<listitem>
    6460      <para>Coreutils-&coreutils-version;</para>
    65     </listitem>
     61    </listitem>-->
    6662   <!--<listitem>
    6763      <para>DejaGNU-&dejagnu-version;</para>
    6864    </listitem>-->
     65    <listitem revision="systemd">
     66      <para>D-Bus-&dbus-version;</para>
     67    </listitem>
     68   <!--<listitem>
     69      <para>Diffutils-&diffutils-version;</para>
     70    </listitem>-->
     71   <!--<listitem>
     72       <para>E2fsprogs-&e2fsprogs-version;</para>
     73    </listitem>-->
     74    <!--<listitem revision="sysv">
     75       <para>Eudev-&eudev-version;</para>
     76    </listitem>-->
     77   <!--<listitem>
     78       <para>Expat-&expat-version;</para>
     79    </listitem>-->
     80    <!--<listitem>
     81       <para>Expect-&expect-version;</para>
     82    </listitem>-->
     83   <!--<listitem>
     84       <para>File-&file-version;</para>
     85    </listitem>-->
     86    <!--<listitem>
     87      <para>Findutils-&findutils-version;</para>
     88    </listitem>-->
     89    <!--<listitem>
     90      <para>Flex-&flex-version;</para>
     91    </listitem>-->
     92    <!--<listitem>
     93      <para>Gawk-&gawk-version;</para>
     94    </listitem>-->
     95   <!--<listitem>
     96       <para>GCC-&gcc-version;</para>
     97    </listitem>-->
     98   <!--<listitem>
     99       <para>GDBM-&gdbm-version;</para>
     100    </listitem>-->
     101    <!--<listitem>
     102      <para>Gettext-&gettext-version;</para>
     103    </listitem>-->
     104   <!--<listitem>
     105      <para>Glibc-&glibc-version;</para>
     106    </listitem>-->
     107    <!--<listitem>
     108      <para>GMP-&gmp-version;</para>
     109    </listitem>-->
     110    <!--<listitem>
     111      <para>Gperf-&gperf-version;</para>
     112    </listitem>-->
     113   <!--<listitem>
     114      <para>Grep-&grep-version;</para>
     115    </listitem>-->
     116    <!--<listitem>
     117      <para>Groff-&groff-version;</para>
     118    </listitem>-->
     119   <!--<listitem>
     120      <para>GRUB-&grub-version;</para>
     121    </listitem>-->
     122    <!--<listitem>
     123      <para>Gzip-&gzip-version;</para>
     124    </listitem>-->
     125   <!--<listitem>
     126      <para>IANA-Etc-&iana-etc-version;</para>
     127    </listitem>-->
     128    <!--<listitem>
     129      <para>Inetutils-&inetutils-version;</para>
     130    </listitem>-->
     131    <!--<listitem>
     132      <para>Intltool-&intltool-version;</para>
     133    </listitem>-->
     134   <!--<listitem>
     135      <para>IPRoute2-&iproute2-version;</para>
     136    </listitem>-->
    69137    <!--<listitem revision="systemd">
    70       <para>D-Bus-&dbus-version;</para>
    71     </listitem>-->
    72    <!--<listitem>
    73       <para>Diffutils-&diffutils-version;</para>
    74     </listitem>-->
    75     <listitem>
    76        <para>E2fsprogs-&e2fsprogs-version;</para>
    77     </listitem>
    78     <listitem revision="sysv">
    79        <para>Eudev-&eudev-version;</para>
    80     </listitem>
    81     <listitem>
    82        <para>Expat-&expat-version;</para>
    83     </listitem>
    84     <!--<listitem>
    85        <para>Expect-&expect-version;</para>
    86     </listitem>-->
    87     <listitem>
    88        <para>File-&file-version;</para>
    89     </listitem>
    90     <listitem>
    91       <para>Findutils-&findutils-version;</para>
    92     </listitem>
    93     <!--<listitem>
    94       <para>Flex-&flex-version;</para>
    95     </listitem>-->
    96     <listitem>
    97       <para>Gawk-&gawk-version;</para>
    98     </listitem>
    99     <!--<listitem>
    100        <para>GCC-&gcc-version;</para>
    101     </listitem>-->
    102     <listitem>
    103        <para>GDBM-&gdbm-version;</para>
    104     </listitem>
    105     <!--<listitem>
    106       <para>Gettext-&gettext-version;</para>
    107     </listitem>-->
    108     <listitem>
    109       <para>Glibc-&glibc-version;</para>
    110     </listitem>
    111     <!--<listitem>
    112       <para>GMP-&gmp-version;</para>
    113     </listitem>-->
    114     <!--<listitem>
    115       <para>Gperf-&gperf-version;</para>
    116     </listitem>-->
    117     <!--<listitem>
    118       <para>Grep-&grep-version;</para>
    119     </listitem>-->
    120     <!--<listitem>
    121       <para>Groff-&groff-version;</para>
    122     </listitem>-->
    123     <!--<listitem>
    124       <para>GRUB-&grub-version;</para>
    125     </listitem>-->
    126     <listitem>
    127       <para>Gzip-&gzip-version;</para>
    128     </listitem>
    129     <listitem>
    130       <para>IANA-Etc-&iana-etc-version;</para>
    131     </listitem>
    132     <listitem>
    133       <para>Inetutils-&inetutils-version;</para>
    134     </listitem>
    135     <!--<listitem>
    136       <para>Intltool-&intltool-version;</para>
    137     </listitem>-->
    138     <listitem>
    139       <para>IPRoute2-&iproute2-version;</para>
    140     </listitem>
     138      <para>Jinja2-&jinja2-version;</para>
     139    </listitem>-->
     140    <!--<listitem>
     141      <para>Kbd-&kbd-version;</para>
     142    </listitem>-->
     143   <!--<listitem>
     144      <para>Kmod-&kmod-version;</para>
     145    </listitem>-->
     146   <!--<listitem>
     147      <para>Less-&less-version;</para>
     148    </listitem>-->
     149    <!--<listitem>
     150      <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     151    </listitem>-->
     152   <!--<listitem>
     153      <para>Libcap-&libcap-version;</para>
     154    </listitem>-->
     155   <!--<listitem>
     156      <para>Libelf-&elfutils-version; (from elfutils)</para>
     157    </listitem>-->
     158   <!--<listitem>
     159      <para>Libffi-&libffi-version;</para>
     160    </listitem>-->
     161    <!--<listitem>
     162      <para>Libpipeline-&libpipeline-version;</para>
     163    </listitem>-->
     164    <!--<listitem>
     165      <para>Libtool-&libtool-version;</para>
     166    </listitem>-->
     167    <listitem>
     168      <para>Linux-&linux-version;</para>
     169    </listitem>
     170   <!--<listitem>
     171      <para>M4-&m4-version;</para>
     172    </listitem>-->
     173    <!--<listitem>
     174      <para>Make-&make-version;</para>
     175    </listitem>-->
     176    <!--<listitem>
     177      <para>Man-DB-&man-db-version;</para>
     178    </listitem>-->
     179   <!--<listitem>
     180      <para>Man-pages-&man-pages-version;</para>
     181    </listitem>-->
    141182    <listitem revision="systemd">
    142       <para>Jinja2-&jinja2-version;</para>
    143     </listitem>
    144     <!--<listitem>
    145       <para>Kbd-&kbd-version;</para>
    146     </listitem>-->
    147     <!--<listitem>
    148       <para>Kmod-&kmod-version;</para>
    149     </listitem>-->
    150     <!--<listitem>
    151       <para>Less-&less-version;</para>
    152     </listitem>-->
    153     <!--<listitem>
    154       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
    155     </listitem>-->
    156     <listitem>
    157       <para>Libcap-&libcap-version;</para>
    158     </listitem>
    159     <listitem>
    160       <para>Libelf-&elfutils-version; (from elfutils)</para>
    161     </listitem>
    162     <!--<listitem>
    163       <para>Libffi-&libffi-version;</para>
    164     </listitem>-->
    165     <listitem>
    166       <para>Libpipeline-&libpipeline-version;</para>
    167     </listitem>
    168     <!--<listitem>
    169       <para>Libtool-&libtool-version;</para>
    170     </listitem>-->
    171     <listitem>
    172       <para>Linux-&linux-version;</para>
    173     </listitem>
    174     <!--<listitem>
    175       <para>M4-&m4-version;</para>
    176     </listitem>-->
    177     <!--<listitem>
    178       <para>Make-&make-version;</para>
    179     </listitem>-->
    180     <listitem>
    181       <para>Man-DB-&man-db-version;</para>
    182     </listitem>
    183     <!--<listitem>
    184       <para>Man-pages-&man-pages-version;</para>
    185     </listitem>-->
    186     <!--<listitem revision="systemd">
    187183      <para>MarkupSafe-&markupsafe-version;</para>
    188     </listitem>-->
     184    </listitem>
    189185    <listitem>
    190186      <para>Meson-&meson-version;</para>
     
    196192      <para>MPFR-&mpfr-version;</para>
    197193    </listitem>-->
    198     <listitem>
     194    <!--<listitem>
    199195      <para>Ncurses-&ncurses-version;</para>
    200     </listitem>
     196    </listitem>-->
    201197    <!--<listitem>
    202198      <para>Ninja-&ninja-version;</para>
    203199    </listitem>-->
    204     <listitem>
     200   <!--<listitem>
    205201      <para>Openssl-&openssl-version;</para>
    206     </listitem>
     202    </listitem>-->
    207203    <!--<listitem>
    208204      <para>Patch-&patch-version;</para>
    209205    </listitem>-->
    210     <!--<listitem>
     206   <!--<listitem>
    211207      <para>Perl-&perl-version;</para>
    212208    </listitem>-->
     
    220216      <para>Psmisc-&psmisc-version;</para>
    221217    </listitem>-->
    222     <listitem>
     218   <!--<listitem>
    223219      <para>Python-&python-version;</para>
    224     </listitem>
    225     <listitem>
     220    </listitem>-->
     221    <!--<listitem>
    226222      <para>Readline-&readline-version;</para>
    227     </listitem>
     223    </listitem>-->
    228224    <!--<listitem>
    229225      <para>Sed-&sed-version;</para>
    230226    </listitem>-->
    231     <listitem>
     227   <!--<listitem>
    232228      <para>Shadow-&shadow-version;</para>
    233     </listitem>
    234     <!--<listitem revision="sysv">
     229    </listitem>-->
     230   <!--<listitem revision="sysv">
    235231      <para>Sysklogd-&sysklogd-version;</para>
    236232    </listitem>-->
    237     <listitem revision="systemd">
     233   <!--<listitem revision="systemd">
    238234      <para>Systemd-&systemd-version;</para>
    239     </listitem>
    240     <listitem revision="sysv">
     235    </listitem>-->
     236   <!--<listitem revision="sysv">
    241237      <para>SysVinit-&sysvinit-version;</para>
    242     </listitem>
     238    </listitem>-->
    243239    <!--<listitem>
    244240      <para>Tar-&tar-version;</para>
    245241    </listitem>-->
    246     <listitem>
     242    <!--<listitem>
    247243      <para>Tcl-&tcl-version;</para>
    248     </listitem>
    249     <!--<listitem>
     244    </listitem>-->
     245   <!--<listitem>
    250246      <para>Texinfo-&texinfo-version;</para>
    251247    </listitem>-->
    252     <listitem>
     248    <!--<listitem>
    253249      <para>Tzdata-&tzdata-version;</para>
    254     </listitem>
    255     <listitem>
     250    </listitem>-->
     251   <!--<listitem>
    256252      <para>Util-Linux-&util-linux-version;</para>
    257     </listitem>
     253    </listitem>-->
    258254    <listitem>
    259255      <para>Vim-&vim-version;</para>
     
    268264      <para>Zlib-&zlib-version;</para>
    269265    </listitem>-->
    270     <listitem>
     266   <!--<listitem>
    271267      <para>Zstd-&zstd-version;</para>
    272     </listitem>
     268    </listitem>-->
    273269  </itemizedlist>
    274270
     
    285281    <title>Added:</title>
    286282    <listitem><para></para></listitem>  <!-- satisfy build -->
    287     <listitem>
    288        <para>binutils-2.38-lto_fix-1.patch</para>
    289     </listitem>
    290     <listitem>
    291        <para>coreutils-9.0-chmod_fix-1.patch</para>
    292     </listitem>
    293     <listitem>
    294       <para>file-5.40-upstream_fixes-1.patch</para>
    295     </listitem>
    296     <listitem>
    297       <para>shadow-4.10-useradd_segfault-1.patch</para>
    298     </listitem>
    299     <listitem revision="sysv">
    300       <para>sysvinit-3.01-consolidated-1.patch</para>
    301     </listitem>
    302     <listitem revision="systemd">
    303       <para>systemd-250-upstream_fixes-1.patch</para>
    304     </listitem>
    305283    <!--
    306     <listitem revision="systemd">
    307       <para>MarkupSafe-&markupsafe-version;</para>
    308     </listitem>
    309     <listitem revision="systemd">
    310       <para>Jinja2-&jinja2-version;</para>
     284    <listitem>
     285      <para>binutils-2.37-upstream_fix-1.patch</para>
     286    </listitem>
     287    <listitem>
     288      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
    311289    </listitem>
    312290    -->
  • chapter05/libstdc++.xml

    r5ffa04b rd9bec1e  
    66]>
    77
    8 <sect1 id="ch-tools-libstdcpp-pass1" role="wrap">
    9   <?dbhtml filename="gcc-libstdc++-pass1.html"?>
     8<sect1 id="ch-tools-libstdcpp" role="wrap">
     9  <?dbhtml filename="gcc-libstdc++.html"?>
    1010
    1111  <sect1info condition="script">
     
    1515  </sect1info>
    1616
    17   <title>Libstdc++ from GCC-&gcc-version;, Pass 1</title>
     17  <title>Libstdc++ from GCC-&gcc-version;</title>
    1818
    19   <indexterm zone="ch-tools-libstdcpp-pass1">
     19  <indexterm zone="ch-tools-libstdcpp">
    2020    <primary sortas="a-GCC">GCC</primary>
    2121    <secondary>tools, libstdc++ pass 1</secondary>
  • chapter06/gcc-pass2.xml

    r5ffa04b rd9bec1e  
    6565esac</userinput></screen>
    6666
    67     <para arch="ml_32,ml_x32,ml_all">Change the default directory name for
     67    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for the
    6868    libraries:</para>
    6969
     
    7171    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
    7272    -i.orig gcc/config/i386/t-linux64</userinput></screen>
    73 <!--
    74 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-cross-patch;</userinput></screen>
    75 -->
     73
     74    <!-- https://gcc.gnu.org/PR100017 -->
     75    <para>Fix an issue causing failure cross-compiling libstdc++:</para>
     76
     77<screen><userinput remap="pre">sed 's/gnu++17/&amp; -nostdinc++/' \
     78    -i libstdc++-v3/src/c++17/Makefile.in</userinput></screen>
     79
     80    <para>Override the building rule of libgcc and libstdc++ headers, to
     81    allow building these libraries with POSIX threads support:</para>
     82
     83<screen><userinput remap="pre">sed '/thread_header =/s/@.*@/gthr-posix.h/' \
     84    -i libgcc/Makefile.in libstdc++-v3/include/Makefile.in</userinput></screen>
     85
    7686    <para>Create a separate build directory again:</para>
    7787
    7888<screen><userinput remap="pre">mkdir -v build
    7989cd       build</userinput></screen>
    80 
    81     <para>Create a symlink that allows libgcc to be built with posix threads
    82     support:</para>
    83 
    84 <screen><userinput remap="pre">mkdir -pv $LFS_TGT/libgcc
    85 ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></screen>
    8690
    8791    <para>Before starting to build GCC, remember to unset any environment
     
    9397    --build=$(../config.guess)                     \
    9498    --host=$LFS_TGT                                \
     99    --target=$LFS_TGT                              \
     100    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
    95101    --prefix=/usr                                  \
    96     CC_FOR_TARGET=$LFS_TGT-gcc                     \
    97102    --with-build-sysroot=$LFS                      \
    98103    --enable-initfini-array                        \
     
    105110    --disable-libssp                               \
    106111    --disable-libvtv                               \
    107     --disable-libstdcxx                            \
    108112    --enable-languages=c,c++</userinput></screen>
    109113<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure"
     
    133137
    134138      <varlistentry>
    135         <term><parameter>-with-build-sysroot=$LFS</parameter></term>
     139        <term><parameter>--with-build-sysroot=$LFS</parameter></term>
    136140        <listitem>
    137141          <para>Normally, using <parameter>--host</parameter> ensures that
     
    146150
    147151      <varlistentry>
     152        <term><parameter>--target=$LFS_TGT</parameter></term>
     153        <listitem>
     154          <para>As we are cross-compiling GCC, it's impossible to build
     155          target libraries (<filename class="libraryfile">libgcc</filename>
     156          and <filename class="libraryfile">libstdc++</filename>) with the
     157          compiled GCC binaries because these binaries won't run on the
     158          host distro.  GCC building system will attempt to use the
     159          C and C++ compilers on the host distro as a workaround by default.
     160          It's not supported to build GCC target libraries with a different
     161          version of GCC, so using host compilers may cause building
     162          failure.  This parameter ensures to build the libraries with GCC
     163          pass 1 and prevent the issue.</para>
     164        </listitem>
     165      </varlistentry>
     166
     167      <varlistentry>
     168        <term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
     169        <listitem>
     170          <para>Allow <filename class="libraryfile">libstdc++</filename> to
     171          use shared <filename class="libraryfile">libgcc</filename> being
     172          built in this pass, instead of the static version built in GCC
     173          pass 1. This is needed for supporting C++ exception
     174          handling.</para>
     175        </listitem>
     176      </varlistentry>
     177
     178      <varlistentry>
    148179        <term><parameter>--enable-initfini-array</parameter></term>
    149180        <listitem>
  • chapter07/chapter07.xml

    r5ffa04b rd9bec1e  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
  • chapter08/gcc.xml

    r5ffa04b rd9bec1e  
    216216    some sanity checks:</para>
    217217
    218     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    219     href="adjusting.xml"
    220     xpointer="xpointer(//*[@os='a'])"/>
    221 
    222     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    223     href="adjusting.xml"
    224     xpointer="xpointer(//*[@os='b'])"/>
    225 
    226     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    227     href="adjusting.xml"
    228     xpointer="xpointer(//*[@os='c'])"/>
    229 
    230     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    231     href="adjusting.xml"
    232     xpointer="xpointer(//*[@os='d'])"/>
    233 
    234     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    235     href="adjusting.xml"
    236     xpointer="xpointer(//*[@os='e'])"/>
    237 
    238     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    239     href="adjusting.xml"
    240     xpointer="xpointer(//*[@os='f'])"/>
     218<screen><userinput>echo 'int main(){}' &gt; dummy.c
     219cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
     220readelf -l a.out | grep ': /lib'</userinput></screen>
     221
     222  <para>There should be no errors,
     223  and the output of the last command will be (allowing for
     224  platform-specific differences in the dynamic linker name):</para>
     225
     226<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
     227
     228  <para>Now make sure that we're setup to use the correct start files:</para>
     229
     230<screen><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
     231
     232  <para>The output of the last command should be:</para>
    241233
    242234<screen><computeroutput>/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crt1.o succeeded
     
    251243  <filename class="directory">/usr/lib</filename> directory.</para>
    252244
    253     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    254     href="adjusting.xml"
    255     xpointer="xpointer(//*[@os='g'])"/>
     245  <para>Verify that the compiler is searching for the correct header
     246  files:</para>
    256247
    257248<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
    258249
    259     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    260     href="adjusting.xml"
    261     xpointer="xpointer(//*[@os='h'])"/>
     250  <para>This command should return the following output:</para>
    262251
    263252<screen><computeroutput>#include &lt;...&gt; search starts here:
     
    270259   different than the above, depending on your system architecture.</para>
    271260
    272     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    273     href="adjusting.xml"
    274     xpointer="xpointer(//*[@os='i'])"/>
    275 
    276     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    277     href="adjusting.xml"
    278     xpointer="xpointer(//*[@os='j'])"/>
    279 
    280     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    281     href="adjusting.xml"
    282     xpointer="xpointer(//*[@os='k'])"/>
     261  <para>Next, verify that the new linker is being used with the correct search paths:</para>
     262
     263<screen><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
     264
     265  <para>References to paths that have components with '-linux-gnu' should
     266  be ignored, but otherwise the output of the last command should be:</para>
    283267
    284268<screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
     
    304288SEARCH_DIR("/usr/lib");</computeroutput></screen>
    305289
    306     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    307     href="adjusting.xml"
    308     xpointer="xpointer(//*[@os='l'])"/>
    309 
    310     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    311     href="adjusting.xml"
    312     xpointer="xpointer(//*[@os='m'])"/>
    313 
    314     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    315     href="adjusting.xml"
    316     xpointer="xpointer(//*[@os='n'])"/>
    317 
    318     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    319     href="adjusting.xml"
    320     xpointer="xpointer(//*[@os='o'])"/>
    321 
    322     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    323     href="adjusting.xml"
    324     xpointer="xpointer(//*[@os='p'])"/>
    325 
    326     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    327     href="adjusting.xml"
    328     xpointer="xpointer(//*[@os='q'])"/>
    329 
    330     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    331     href="adjusting.xml"
    332     xpointer="xpointer(//*[@os='r'])"/>
    333 
    334     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    335     href="adjusting.xml"
    336     xpointer="xpointer(//*[@os='s'])"/>
    337 
    338     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    339     href="adjusting.xml"
    340     xpointer="xpointer(//*[@os='t'])"/>
    341 
    342     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    343     href="adjusting.xml"
    344     xpointer="xpointer(//*[@os='u'])"/>
    345 
    346     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    347     href="adjusting.xml"
    348     xpointer="xpointer(//*[@os='v'])"/>
     290  <para>Next make sure that we're using the correct libc:</para>
     291
     292<screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
     293
     294  <para>The output of the last command should be:</para>
     295
     296<screen><computeroutput>attempt to open /usr/lib/libc.so.6 succeeded</computeroutput></screen>
     297
     298  <para>Make sure GCC is using the correct dynamic linker:</para>
     299
     300<screen><userinput>grep found dummy.log</userinput></screen>
     301
     302  <para>The output of the last command should be (allowing for
     303  platform-specific differences in dynamic linker name):</para>
     304
     305<screen><computeroutput>found ld-linux-x86-64.so.2 at /usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
     306
     307  <para>If the output does not appear as shown above or is not received
     308  at all, then something is seriously wrong. Investigate and retrace the
     309  steps to find out where the problem is and correct it. <!--The most likely
     310  reason is that something went wrong with the specs file adjustment.--> Any
     311  issues will need to be resolved before continuing with the process.</para>
     312
     313  <para>Once everything is working correctly, clean up the test files:</para>
     314
     315<screen><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
    349316
    350317    <para>Finally, move a misplaced file:</para>
  • chapter08/iproute2.xml

    r5ffa04b rd9bec1e  
    6262    <para>Compile the package:</para>
    6363
    64 <screen><userinput remap="make">make</userinput></screen>
     64<screen><userinput remap="make">make NETNS_RUN_DIR=/run/netns</userinput></screen>
    6565
    6666    <para>This package does not have a working test suite.</para>
  • chapter08/meson.xml

    r5ffa04b rd9bec1e  
    5757<screen><userinput remap="make">python3 setup.py build</userinput></screen>
    5858
    59     <para>This package does not come with a test suite.</para>
     59    <para>The test suite requires some packages out of the scope of LFS.</para>
    6060
    6161    <para>Install the package:</para>
  • chapter08/tcl.xml

    r5ffa04b rd9bec1e  
    6464cd unix
    6565./configure --prefix=/usr           \
    66             --mandir=/usr/share/man \
    67             $([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</userinput></screen>
    68 
    69     <variablelist>
    70       <title>The meaning of the configure options:</title>
    71 
    72       <varlistentry>
    73         <term><parameter>$([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</parameter></term>
    74         <listitem>
    75           <para>The construct <parameter>$(&lt;shell command&gt;)</parameter>
    76           is replaced by the output of the shell command.  Here this output is
    77           empty if running on a 32 bit machine, and is
    78           <parameter>--enable-64bit</parameter> if running on a 64 bit machine.
    79           </para>
    80         </listitem>
    81       </varlistentry>
    82 
    83     </variablelist>
     66            --mandir=/usr/share/man</userinput></screen>
    8467
    8568    <para>Build the package:</para>
  • packages.ent

    r5ffa04b rd9bec1e  
    115115<!ENTITY coreutils-fin-sbu "2.6 SBU">
    116116
    117 <!ENTITY dbus-version "1.12.20">
    118 <!ENTITY dbus-size "2,048 KB">
    119 <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
    120 <!ENTITY dbus-md5 "dfe8a71f412e0b53be26ed4fbfdc91c4">
     117<!ENTITY dbus-version "1.14.0">
     118<!ENTITY dbus-size "1,332 KB">
     119<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
     120<!ENTITY dbus-md5 "ddd5570aff05191dbee8e42d751f1b7d">
    121121<!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
    122122<!ENTITY dbus-fin-du "18 MB">
     
    437437<!ENTITY linux-major-version "5">
    438438<!ENTITY linux-minor-version "16">
    439 <!ENTITY linux-patch-version "9">
     439<!ENTITY linux-patch-version "12">
    440440<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    441441<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    442 <!ENTITY linux-size "124,577 KB">
     442<!ENTITY linux-size "124,572 KB">
    443443<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    444 <!ENTITY linux-md5 "4d6a704bf3e249ef6189b6f17457084b">
     444<!ENTITY linux-md5 "e859941968400c4437bd62b4fe39b7b7">
    445445<!ENTITY linux-home "https://www.kernel.org/">
    446446<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
     
    492492<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
    493493
    494 <!ENTITY markupsafe-version "2.0.1">
     494<!ENTITY markupsafe-version "2.1.0">
    495495<!ENTITY markupsafe-size "20 KB">
    496496<!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
    497 <!ENTITY markupsafe-md5 "892e0fefa3c488387e5cc0cad2daa523">
    498 <!ENTITY markupsafe-home "https://markupsafe.palletsprojects.com/en/2.0.x/">
     497<!ENTITY markupsafe-md5 "1c3ef96104e89fc64f90e48194a4f154">
     498<!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
    499499<!ENTITY markupsafe-fin-du "520 KB">
    500500<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    501501
    502 <!ENTITY meson-version "0.61.1">
    503 <!ENTITY meson-size "1,963 KB">
     502<!ENTITY meson-version "0.61.2">
     503<!ENTITY meson-size "1,968 KB">
    504504<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    505 <!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f">
     505<!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
    506506<!ENTITY meson-home "https://mesonbuild.com">
    507507<!ENTITY meson-fin-du "41 MB">
     
    730730<!ENTITY util-linux-fin-sbu "1.1 SBU">
    731731
    732 <!ENTITY vim-version "8.2.4383">
     732<!ENTITY vim-version "8.2.4489">
    733733<!ENTITY vim-majmin "82">
    734734<!ENTITY vim-docdir "vim/vim82">
    735 <!ENTITY vim-size "15,622 KB">
     735<!ENTITY vim-size "10,380 KB">
    736736<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
    737 <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
    738 <!ENTITY vim-md5 "3168ff48e382a1201bd0cbd0209bd3e0">
     737<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
     738<!ENTITY vim-md5 "41e97917fc46d044ffe951c197509efe">
    739739<!ENTITY vim-home "https://www.vim.org">
    740740<!ENTITY vim-fin-du "206 MB">
Note: See TracChangeset for help on using the changeset viewer.