From 6cad4497599ac65e6f03e7a24325063943a77a73 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 2 Mar 2022 21:08:50 +0800 Subject: [PATCH 1/6] add changelog entries for libstdc++ pass 2 and tcl changes --- chapter01/changelog.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6f6e12a61..c25f61d13 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,20 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2022-03-02 + + + [xry111] - Build libstdc++ in GCC pass 2, and remove the + seperate libstdc++ pass 2. + + + [xry111] - Remove unneeded + --enable-64bit for tcl. + + + + 2022-03-01 From 7756de365c28daa06887016b8ee0a151aac6706a Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 2 Mar 2022 21:20:22 +0800 Subject: [PATCH 2/6] remove all "what's new" entries after release --- chapter01/whatsnew.xml | 194 +++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 103 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 817e3e4c8..f4f4be90c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -39,30 +39,30 @@ - + + + + + - + @@ -72,142 +72,142 @@ - + + + - + + - - Gawk-&gawk-version; - + - + - + - - - + + + - + + - - - + + + - + - + + - - Man-DB-&man-db-version; - + - + - + - + - - + + - + + - + + - - Tcl-&tcl-version; - + - + + + @@ -267,9 +267,9 @@ - + - - binutils-2.38-lto_fix-1.patch - - - coreutils-9.0-chmod_fix-1.patch - - - file-5.40-upstream_fixes-1.patch - - - shadow-4.10-useradd_segfault-1.patch - - - sysvinit-3.01-consolidated-1.patch - - - systemd-250-upstream_fixes-1.patch - - + @@ -168,9 +168,9 @@ - + @@ -183,12 +183,12 @@ - - + @@ -255,9 +255,9 @@ - + @@ -291,12 +291,6 @@ gcc-11.1.0-upstream_fixes-1.patch - - MarkupSafe-&markupsafe-version; - - - Jinja2-&jinja2-version; - --> diff --git a/chapter08/meson.xml b/chapter08/meson.xml index 36d787185..ffd4153b0 100644 --- a/chapter08/meson.xml +++ b/chapter08/meson.xml @@ -56,7 +56,7 @@ python3 setup.py build - This package does not come with a test suite. + The test suite requires some packages out of the scope of LFS. Install the package: diff --git a/packages.ent b/packages.ent index e20364803..6215f2586 100644 --- a/packages.ent +++ b/packages.ent @@ -114,10 +114,10 @@ - - - - + + + + @@ -427,12 +427,12 @@ - + - + - + - - + + From 7c05ea2a4fb165a36f150b34c55938cdb98e8d95 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 3 Mar 2022 00:36:24 +0800 Subject: [PATCH 4/6] remove outdated cross-chap5 announcement in what's new It should have been removed in 10.1, and in 11.0 there should have been "the version of LFS has switched to a merged-/usr layout". But we just forgot to update this all the time :). --- chapter01/whatsnew.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2f737c16f..fe9b3b278 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -11,10 +11,6 @@ What's new since the last release - In this version of LFS, there has been a major reorganization - of the book using techniques that avoid changing the host system - and provides a more straight forward build process. - Below is a list of package updates made since the previous release of the book. From cc2c231b500bb4ae0fbbb1ff2bda7707dfd2189e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 3 Mar 2022 04:13:40 +0800 Subject: [PATCH 5/6] remove meson "test SBU" added unintentionally --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 6215f2586..fb2704ff7 100644 --- a/packages.ent +++ b/packages.ent @@ -496,7 +496,7 @@ - + From 9c4380393eb32dde391a26e83e358f1a9a1939f2 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 5 Mar 2022 03:03:19 +0800 Subject: [PATCH 6/6] gcc: use $(gcc -dumpmachine) instead of *linux-gnu It's consistent with other commands in the same page, and also helpful for porting to targets with different triplets (-musl or -gnuabi64). --- chapter08/gcc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml index 4c62a8d17..16bb5f99f 100644 --- a/chapter08/gcc.xml +++ b/chapter08/gcc.xml @@ -174,7 +174,7 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/root user and group: chown -v -R root:root \ - /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed} + /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include{,-fixed} Create a symlink required by the FHS