Changeset bc12dcb


Ignore:
Timestamp:
02/24/2020 10:15:33 PM (3 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1, multilib-before-cross
Children:
54092c6
Parents:
788f897
Message:

Merge upstream; Upgrade isl+firmware; add description to glibc

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

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r788f897 rbc12dcb  
    4545    appropriate for the entry or if needed the entire day's listitem.
    4646       -->
     47    <listitem arch="ml_32,ml_x32,ml_all">
     48      <para>2020-02-24</para>
     49      <itemizedlist>
     50        <listitem arch="ml_32,ml_x32,ml_all">
     51          <para>[thomas] - Add description to glibc configuration in Chapter 5.
     52            Thanks to Kevin Buckley.</para>
     53        </listitem>
     54      </itemizedlist>
     55    </listitem>
     56
     57    <listitem arch="ml_32,ml_x32,ml_all">
     58      <para>2020-02-21</para>
     59      <itemizedlist>
     60        <listitem arch="ml_32,ml_x32,ml_all">
     61          <para>[thomas] - Update to isl-0.22.1.</para>
     62        </listitem>
     63        <listitem arch="ml_32,ml_x32,ml_all">
     64          <para>[thomas] - Upgrade to linux-firmware-20200219</para>
     65        </listitem>
     66      </itemizedlist>
     67    </listitem>
     68
    4769    <listitem revision="systemd">
    4870      <para>2020-02-16</para>
    … …  
    345367    </listitem>
    346368
    347     <listitem revision="sysv">
     369    <listitem arch="ml_32,ml_x32,ml_all">
    348370      <para>2019-12-02</para>
    349371      <itemizedlist>

  • chapter05/binutils-pass2.xml

    r788f897 rbc12dcb  
    115115        <term><parameter>--with-sysroot</parameter></term>
    116116        <listitem>
    117           <para>The sysroot feature enables the linker to find shared objects
    118           which are required by other shared objects explicitly included on the
    119           linker's command line. Without this, some packages may not build
    120           successfully on some hosts.</para>
     117          <para>This defines a default (non-existent) sysroot directory
     118          <filename class="directory">/tools/$LFS_TGT/sys-root</filename>.
     119          It is useful when looking for shared objects which are required by
     120          other shared objects explicitly included on the linker's command
     121          line. Those objects are searched into the directories listed in
     122          <filename>&lt;sysroot&gt;/etc/ld.so.conf</filename>, and failing
     123          that, into the linker search path, which is right. If this switch
     124          is not given, <filename>/etc/ld.so.conf</filename> on the host
     125          is used, that is, programs may be linked to libraries on
     126          the host, which we want to avoid.</para>
    121127        </listitem>
    122128      </varlistentry>

  • chapter05/gcc-pass1.xml

    r788f897 rbc12dcb  
    141141    <!-- see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724 -->
    142142    <!-- Fix applied in ch5-gcc-pass{1,2}, ch6-gcc -->
     143<!--
    143144    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
    144145
    145146<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
    146147    -i gcc/graphite.h</userinput></screen>
     148-->
    147149
    148150    <para>The GCC documentation recommends building GCC

  • chapter05/gcc-pass2.xml

    r788f897 rbc12dcb  
    123123
    124124    <!-- Following patch might be obsolete with gcc >= 8.2.1 -->
     125<!--
    125126    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
    126127
    127128<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
    128129    -i gcc/graphite.h</userinput></screen>
     130-->
    129131
    130132    <para>

  • chapter05/glibc.xml

    r788f897 rbc12dcb  
    217217             --host=${LFS_TGT32}                \
    218218             --enable-kernel=&min-kernel;             \
     219             --with-headers=/tools/include      \
     220             --with-binutils=/tools/bin         \
    219221             --enable-multi-arch                \
    220222             --libdir=/tools/lib32              \
    221              --libexecdir=/tools/lib32          \
    222              --with-headers=/tools/include      \
    223              --with-binutils=/tools/bin</userinput></screen>
     223             --libexecdir=/tools/lib32</userinput></screen>
    224224<!--                      \
    225225             libc_cv_forced_unwind=yes          \
    226226             libc_cv_c_cleanup=yes</userinput></screen> -->
     227
     228    <variablelist>
     229      <title>The meaning of the extra configure options:</title>
     230
     231      <varlistentry>
     232        <term><parameter>--enable-multi-arch</parameter></term>
     233        <listitem>
     234          <para>Enables glibc for multiarch environments.</para>
     235        </listitem>
     236      </varlistentry>
     237
     238      <varlistentry>
     239        <term><parameter>--libdir=/tools/lib32, --libexecdir=/tools/lib32</parameter></term>
     240        <listitem>
     241          <para>Overrides location for installing 32-bit files.</para>
     242        </listitem>
     243      </varlistentry>
     244
     245      <varlistentry>
     246        <term><parameter>--with-binutils=/tools/bin</parameter></term>
     247        <listitem>
     248          <para>This tells Glibc to compile itself against the utilities
     249          found within our "tools" heirachy, because otherwise...</para>
     250        </listitem>
     251      </varlistentry>
     252
     253    </variablelist>
    227254
    228255    <para>Now compile the 32-bit version of glibc:</para>
    … …  
    235262install -vm644 DESTDIR/tools/include/gnu/{lib-names,stubs}-32.h \
    236263               /tools/include/gnu/
    237 ln -svf /tools/lib32/ld-linux.so.2 /tools/lib/
    238 cd ..</userinput></screen>
     264ln -svf /tools/lib32/ld-linux.so.2 /tools/lib/</userinput></screen>
    239265
    240266  </sect2>
    … …  
    244270
    245271    <para>Create a build directory for redoing glibc for x32-bit:</para>
    246 <screen><userinput remap="pre">mkdir build32x
    247 cd build32x</userinput></screen>
     272<screen><userinput remap="pre">mkdir ../build32x
     273cd ../build32x</userinput></screen>
    248274
    249275    <para>Rebuild glibc for x32-bit:</para>
    … …  
    258284             --host=${LFS_TGTX32}               \
    259285             --enable-kernel=&min-kernel;             \
     286             --with-headers=/tools/include      \
     287             --with-binutils=/tools/bin         \
    260288             --enable-multi-arch                \
    261289             --libdir=/tools/libx32             \
    262              --libexecdir=/tools/libx32         \
    263              --with-headers=/tools/include      \
    264              --with-binutils=/tools/bin</userinput></screen>
     290             --libexecdir=/tools/libx32</userinput></screen>
    265291<!--                      \
    266292             libc_cv_forced_unwind=yes          \
    267293             libc_cv_c_cleanup=yes</userinput></screen> -->
     294
     295    <variablelist>
     296      <title>The meaning of the extra configure options:</title>
     297
     298      <varlistentry>
     299        <term><parameter>--enable-multi-arch</parameter></term>
     300        <listitem>
     301          <para>Enables glibc for multiarch environments.</para>
     302        </listitem>
     303      </varlistentry>
     304
     305      <varlistentry>
     306        <term><parameter>--libdir=/tools/libx32, --libexecdir=/tools/libx32</parameter></term>
     307        <listitem>
     308          <para>Overrides location for installing x32-bit files.</para>
     309        </listitem>
     310      </varlistentry>
     311
     312      <varlistentry>
     313        <term><parameter>--with-binutils=/tools/bin</parameter></term>
     314        <listitem>
     315          <para>This tells Glibc to compile itself against the utilities
     316          found within our "tools" heirachy, because otherwise...</para>
     317        </listitem>
     318      </varlistentry>
     319
     320    </variablelist>
    268321
    269322    <para>Now compile the x32-bit version of glibc:</para>

  • chapter05/libstdc++.xml

    r788f897 rbc12dcb  
    8383        <term><parameter>--disable-libstdcxx-threads</parameter></term>
    8484        <listitem>
    85           <para>Since we have not yet built the C threads library, the C++
    86           one cannot be built either.</para>
     85          <para>Since gcc-pass1 is built without thread support, the C++
     86          thread library cannot be built either.</para>
    8787        </listitem>
    8888      </varlistentry>

  • chapter06/createfiles.xml

    r788f897 rbc12dcb  
    4747ln -sv bash /bin/sh</userinput></screen>
    4848
    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
     49  <para arch="ml_32,ml_all">32-bit builds also require these links:</para>
     50
     51<screen arch="ml_32,ml_all"><userinput arch="ml_32,ml_all">ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
    5252ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32</userinput></screen>
    5353

  • chapter06/gcc.xml

    r788f897 rbc12dcb  
    6565
    6666    <!-- Following patch might be obsolete with gcc >= 8.2.1 -->
     67<!--
    6768    <para>Fix an issue with isl-&isl-version;:</para>
    6869
    6970<screen><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
    7071    -i gcc/graphite.h</userinput></screen>
     72-->
    7173
    7274   <para>

  • packages.ent

    r788f897 rbc12dcb  
    358358<!ENTITY iproute2-ch6-sbu "0.2 SBU">
    359359
    360 <!ENTITY isl-version "0.22">
     360<!ENTITY isl-version "0.22.1">
    361361<!ENTITY isl-size "1.6 MB">
    362362<!ENTITY isl-url "http://isl.gforge.inria.fr/isl-&isl-version;.tar.xz">
    363 <!ENTITY isl-md5 "ce103a7924ef31f1ff47b7ac868f434b">
     363<!ENTITY isl-md5 "6e124849a9b62e3e2d5d51e955323f6e">
    364364<!ENTITY isl-home "http://isl.gforge.inria.fr/">
    365365<!ENTITY isl-ch6-du "20 MB">
    … …  
    450450<!ENTITY linux-headers-ch6-sbu "0.1 SBU">
    451451
    452 <!ENTITY linux-firmware-version "20191026">
    453 <!ENTITY linux-firmware-size "91,572 KB">
     452<!ENTITY linux-firmware-version "20200219">
     453<!ENTITY linux-firmware-size "107 MB">
    454454<!ENTITY linux-firmware-url "http://www.linuxfromscratch.org/~dj/linux-firmware-&linux-firmware-version;.tar.xz">
    455 <!ENTITY linux-firmware-md5 "079dcff9c13cccddb40cbfc392f7a790">
     455<!ENTITY linux-firmware-md5 "6f0bc3f1daa494c4c4c7c7578da92030">
    456456<!ENTITY linux-firmware-home "http://www.kernel.org/">
    457 <!ENTITY linux-firmware-ch6-du "582 MB">
    458 <!ENTITY linux-firmware-ch6-sbu "0.1 SBU">
     457<!ENTITY linux-firmware-ch5-du "520 MB">
     458<!ENTITY linux-firmware-ch5-sbu "0.1 SBU">
     459<!ENTITY linux-firmware-ch6-du "&linux-firmware-ch5-du;">
     460<!ENTITY linux-firmware-ch6-sbu "&linux-firmware-ch5-sbu;">
    459461
    460462<!ENTITY m4-version "1.4.18">
Note: See TracChangeset for help on using the changeset viewer.