Author: pierre
Date: Sat May 9 03:49:56 2020
New Revision: 11842
Log:
merge trunk and add patch to gcc pass2
Modified:
branches/cross-chap5/appendices/dependencies.xml
branches/cross-chap5/chapter01/changelog.xml
branches/cross-chap5/chapter03/patches.xml
branches/cross-chap5/chapter05/gcc-pass2.xml
branches/cross-chap5/chapter06/bison.xml
branches/cross-chap5/chapter06/e2fsprogs.xml
branches/cross-chap5/chapter06/flex.xml
branches/cross-chap5/chapter06/gcc.xml
branches/cross-chap5/chapter06/gdbm.xml
branches/cross-chap5/chapter06/man-db.xml
branches/cross-chap5/general.ent
branches/cross-chap5/packages.ent
branches/cross-chap5/patches.ent
Modified: branches/cross-chap5/appendices/dependencies.xml
==============================================================================
--- branches/cross-chap5/appendices/dependencies.xml Fri May 8 23:23:56
2020 (r11841)
+++ branches/cross-chap5/appendices/dependencies.xml Sat May 9 03:49:56
2020 (r11842)
@@ -224,8 +224,8 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
- <seg>Bash, Binutils, Bison, Coreutils, GCC, Glibc,
- Grep, Make, Perl, and Readline</seg>
+ <seg>Bash, Binutils, Coreutils, GCC, Glibc,
+ Grep, and Make</seg>
</seglistitem>
</segmentedlist>
Modified: branches/cross-chap5/chapter01/changelog.xml
==============================================================================
--- branches/cross-chap5/chapter01/changelog.xml Fri May 8 23:23:56
2020 (r11841)
+++ branches/cross-chap5/chapter01/changelog.xml Sat May 9 03:49:56
2020 (r11842)
@@ -43,6 +43,42 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2020-05-09</para>
+ <itemizedlist>
+ <listitem>
+ <para>[pierre] - Patch GCC pass 2 to allow cross-compile
+ (specific to new cross method).</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2020-05-08</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to bison-3.6. Fixes
+ <ulink url="&lfs-ticket-root;4652">#4652</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to gcc-10.1.0. Fixes
+ <ulink url="&lfs-ticket-root;4651">#4651</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to libcap-2.34. Fixes
+ <ulink url="&lfs-ticket-root;4650">#4650</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to bc-2.7.2. Fixes
+ <ulink url="&lfs-ticket-root;4648">#4648</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-5.6.11. Fixes
+ <ulink url="&lfs-ticket-root;4649">#4649</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2020-05-01</para>
<itemizedlist>
<listitem>
Modified: branches/cross-chap5/chapter03/patches.xml
==============================================================================
--- branches/cross-chap5/chapter03/patches.xml Fri May 8 23:23:56 2020
(r11841)
+++ branches/cross-chap5/chapter03/patches.xml Sat May 9 03:49:56 2020
(r11842)
@@ -85,6 +85,14 @@
</varlistentry>
-->
<varlistentry>
+ <term>GCC Cross Build Fix Patch -
<token>&gcc-cross-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&gcc-cross-patch;"/></para>
+ <para>MD5 sum: <literal>&gcc-cross-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Kbd Backspace/Delete Fix Patch -
<token>&kbd-backspace-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&kbd-backspace-patch;"/></para>
Modified: branches/cross-chap5/chapter05/gcc-pass2.xml
==============================================================================
--- branches/cross-chap5/chapter05/gcc-pass2.xml Fri May 8 23:23:56
2020 (r11841)
+++ branches/cross-chap5/chapter05/gcc-pass2.xml Sat May 9 03:49:56
2020 (r11842)
@@ -64,6 +64,11 @@
;;
esac</userinput></screen>
+ <para>Fix an issue with GCC-10.1 when building with a cross
+ compiler:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i
../&gcc-cross-patch;</userinput></screen>
+
<para>Create a separate build directory again:</para>
<screen><userinput remap="pre">mkdir -v build
Modified: branches/cross-chap5/chapter06/bison.xml
==============================================================================
--- branches/cross-chap5/chapter06/bison.xml Fri May 8 23:23:56 2020
(r11841)
+++ branches/cross-chap5/chapter06/bison.xml Sat May 9 03:49:56 2020
(r11842)
@@ -62,7 +62,7 @@
<screen><userinput remap="test">make check</userinput></screen>
- <para>13 tests fail in the "Diagnostics" section, probably because of
+ <para>Fourteen tests fail in the "Diagnostics" section, probably because of
missing locales.</para>
<!--
Modified: branches/cross-chap5/chapter06/e2fsprogs.xml
==============================================================================
--- branches/cross-chap5/chapter06/e2fsprogs.xml Fri May 8 23:23:56
2020 (r11841)
+++ branches/cross-chap5/chapter06/e2fsprogs.xml Sat May 9 03:49:56
2020 (r11842)
@@ -151,7 +151,7 @@
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
+ <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2freefrag,
e2fsck, e2image, e2label, e2mmpstatus, e2scrub, e2scrub_all, e2undo,
e4crypt, e4defrag, filefrag, fsck.ext2,
fsck.ext3, fsck.ext4, logsave, lsattr, mk_cmds, mke2fs,
Modified: branches/cross-chap5/chapter06/flex.xml
==============================================================================
--- branches/cross-chap5/chapter06/flex.xml Fri May 8 23:23:56 2020
(r11841)
+++ branches/cross-chap5/chapter06/flex.xml Sat May 9 03:49:56 2020
(r11842)
@@ -41,17 +41,20 @@
<sect2 role="installation">
<title>Installation of Flex</title>
+<!--
<para>First, fix a problem introduced with glibc-2.26:</para>
<screen><userinput remap="pre">sed -i "/math.h/a #include <malloc.h>"
src/flexdef.h</userinput></screen>
<para>The build procedure assumes the <application>help2man</application>
- program is available to create a man page from the executable --help
option.
+ program is available to create a man page from the executable - -help
option.
This is not present, so we use an environment variable to skip this
process.
- Now, prepare Flex for compilation:</para>
+ Now, prepare Flex for compilation:</para> -->
-<screen><userinput remap="configure">HELP2MAN=/bin/true \
-./configure --prefix=/usr
--docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+ <para>Prepare Flex for compilation:</para>
+
+<!-- <screen><userinput remap="configure">HELP2MAN=/tools/bin/true \ -->
+<screen><userinput remap="configure">./configure --prefix=/usr
--docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
<para>Compile the package:</para>
Modified: branches/cross-chap5/chapter06/gcc.xml
==============================================================================
--- branches/cross-chap5/chapter06/gcc.xml Fri May 8 23:23:56 2020
(r11841)
+++ branches/cross-chap5/chapter06/gcc.xml Sat May 9 03:49:56 2020
(r11842)
@@ -119,8 +119,6 @@
are known to fail in LFS chroot environment because they require
/etc/hosts and iana-etc.</para>
- <para>Two tests named pr57193.c and pr90178.c are known to fail.</para>
-
<para>A few unexpected failures cannot always be avoided. The GCC
developers
are usually aware of these issues, but have not resolved them yet.
Unless the test results are vastly different from those at the above URL,
Modified: branches/cross-chap5/chapter06/gdbm.xml
==============================================================================
--- branches/cross-chap5/chapter06/gdbm.xml Fri May 8 23:23:56 2020
(r11841)
+++ branches/cross-chap5/chapter06/gdbm.xml Sat May 9 03:49:56 2020
(r11842)
@@ -44,6 +44,10 @@
<sect2 role="installation">
<title>Installation of GDBM</title>
+ <para>First, fix an issue first identified by gcc-10:</para>
+
+<screen><userinput remap="pre">sed -r -i
'/^char.*parseopt_program_(doc|args)/d' src/parseopt.c</userinput></screen>
+
<para>Prepare GDBM for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
Modified: branches/cross-chap5/chapter06/man-db.xml
==============================================================================
--- branches/cross-chap5/chapter06/man-db.xml Fri May 8 23:23:56 2020
(r11841)
+++ branches/cross-chap5/chapter06/man-db.xml Sat May 9 03:49:56 2020
(r11842)
@@ -126,6 +126,8 @@
<screen><userinput remap="test">make check</userinput></screen>
+ <para>One test, man-missing-locales, is known to fail in the LFS chroot
envirnment.</para>
+
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
Modified: branches/cross-chap5/general.ent
==============================================================================
--- branches/cross-chap5/general.ent Fri May 8 23:23:56 2020 (r11841)
+++ branches/cross-chap5/general.ent Sat May 9 03:49:56 2020 (r11842)
@@ -1,13 +1,13 @@
-<!ENTITY version "20200501-cross-chap5">
+<!ENTITY version "20200508-cross-chap5">
<!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 generic-version "cross-chap5"> <!-- Use "development" or
"x.y[-pre{x}]" -->
-<!ENTITY versiond "20200501-cross-cp5-systemd">
+<!ENTITY versiond "20200508-cross-cp5-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "May 1st, 2020">
+<!ENTITY releasedate "May 8th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not
– -->
Modified: branches/cross-chap5/packages.ent
==============================================================================
--- branches/cross-chap5/packages.ent Fri May 8 23:23:56 2020 (r11841)
+++ branches/cross-chap5/packages.ent Sat May 9 03:49:56 2020 (r11842)
@@ -50,10 +50,10 @@
<!ENTITY bash-ch6-du "62 MB">
<!ENTITY bash-ch6-sbu "1.9 SBU">
-<!ENTITY bc-version "2.6.1">
-<!ENTITY bc-size "162 KB">
+<!ENTITY bc-version "2.7.2">
+<!ENTITY bc-size "185 KB">
<!ENTITY bc-url
"https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz";>
-<!ENTITY bc-md5 "e9ffa2cba2a37e1b145034be78c3be45">
+<!ENTITY bc-md5 "28235ceaf2280b909591ace7a3a4f051">
<!ENTITY bc-home "https://github.com/gavinhoward/bc";>
<!ENTITY bc-ch6-du "2.9 MB">
<!ENTITY bc-ch6-sbu "0.1 SBU">
@@ -70,10 +70,10 @@
<!ENTITY binutils-ch6-du "5.1 GB">
<!ENTITY binutils-ch6-sbu "6.7 SBU">
-<!ENTITY bison-version "3.5.4">
-<!ENTITY bison-size "2,315 KB">
+<!ENTITY bison-version "3.6">
+<!ENTITY bison-size "2,406 KB">
<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "eca85fc68de0aa77b26963b0a30d995a">
+<!ENTITY bison-md5 "132d05287e2c9f98d848e2366f17a949">
<!ENTITY bison-home "&gnu-software;bison/">
<!ENTITY bison-ch5-du "43 MB">
<!ENTITY bison-ch5-sbu "0.3 SBU">
@@ -224,23 +224,23 @@
<!ENTITY gawk-ch6-du "47 MB">
<!ENTITY gawk-ch6-sbu "0.4 SBU">
-<!ENTITY gcc-version "9.3.0">
-<!ENTITY gcc-size "68,881 KB">
+<!ENTITY gcc-version "10.1.0">
+<!ENTITY gcc-size "72,844 KB">
<!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-<!ENTITY gcc-md5 "d00a144b771ddeb021b61aa205b7e345">
+<!ENTITY gcc-md5 "7d48e00245330c48b670ec9a2c518291">
<!ENTITY gcc-home "https://gcc.gnu.org/";>
-<!ENTITY gcc-ch5p1-du "3.1 GB">
-<!ENTITY gcc-ch5p1-sbu "10 SBU">
-<!ENTITY gcc-ch5p2-du "3.7 GB">
-<!ENTITY gcc-ch5p2-sbu "13 SBU">
-<!ENTITY gcc-ch6-du "4.2 GB ">
-<!ENTITY gcc-ch6-sbu "88 SBU (with tests)">
+<!ENTITY gcc-ch5p1-du "3.9 GB">
+<!ENTITY gcc-ch5p1-sbu "12 SBU">
+<!ENTITY gcc-ch5p2-du "4.3 GB">
+<!ENTITY gcc-ch5p2-sbu "14 SBU">
+<!ENTITY gcc-ch6-du "4.9 GB ">
+<!ENTITY gcc-ch6-sbu "103 SBU (with tests)">
<!ENTITY libquadmath-version "0.0.0">
<!ENTITY libstdcpp-version "6.0.28">
<!ENTITY libitm-version "1.0.0">
<!ENTITY libatomic-version "1.2.0">
-<!ENTITY libmpx-version "2.0.1">
-<!ENTITY libmpxwrap-version "2.0.1">
+<!--<!ENTITY libmpx-version "2.0.1">-->
+<!--<!ENTITY libmpxwrap-version "2.0.1">-->
<!--<!ENTITY libcilkrts-version "5.0.0">-->
<!ENTITY libstdcpp-ch5-du "878 MB">
@@ -391,10 +391,10 @@
<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB">
<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
-<!ENTITY libcap-version "2.33">
+<!ENTITY libcap-version "2.34">
<!ENTITY libcap-size "109 KB">
<!ENTITY libcap-url
"&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "dcc6220b4a9bf260050b20c07edcddf4">
+<!ENTITY libcap-md5 "66028a8080a0891c54b202bb5e749035">
<!ENTITY libcap-home "https://sites.google.com/site/fullycapable/";>
<!ENTITY libcap-ch6-du "8.5 MB">
<!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
@@ -425,12 +425,12 @@
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "6">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-patch-version "11">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version
"&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "109,179 KB">
<!ENTITY linux-url
"&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "868fd09779cadda29cb27c93fd40466e">
+<!ENTITY linux-md5 "2af56bf5539b0e21fd6b27e0941a92aa">
<!ENTITY linux-home "https://www.kernel.org/";>
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -700,13 +700,13 @@
<!ENTITY util-linux-ch6-du "289 MB">
<!ENTITY util-linux-ch6-sbu "1.1 SBU">
-<!ENTITY vim-version "8.2.0486">
+<!ENTITY vim-version "8.2.0716">
<!ENTITY vim-majmin "82">
<!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "14,532 KB">
+<!ENTITY vim-size "14,595 KB">
<!--<!ENTITY vim-url
"https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz";>-->
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
-<!ENTITY vim-md5 "b1b26d5b7ec294186702fb982b6d226c">
+<!ENTITY vim-md5 "004b4596f185889fbca5b8d513f294ce">
<!ENTITY vim-home "https://www.vim.org";>
<!ENTITY vim-ch6-du "202 MB">
<!ENTITY vim-ch6-sbu "1.7 SBU">
Modified: branches/cross-chap5/patches.ent
==============================================================================
--- branches/cross-chap5/patches.ent Fri May 8 23:23:56 2020 (r11841)
+++ branches/cross-chap5/patches.ent Sat May 9 03:49:56 2020 (r11842)
@@ -20,6 +20,10 @@
<!ENTITY flex-fixes-patch-size "3.4 KB">
-->
+<!ENTITY gcc-cross-patch "gcc-&gcc-version;-cet_fix-1.patch">
+<!ENTITY gcc-cross-patch-md5 "f37d8a6b4c943a6f8eaf541923fed838">
+<!ENTITY gcc-cross-patch-size "4.3 KB">
+
<!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
<!ENTITY glibc-fhs-patch-size "2.8 KB">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
