From b83366b1b49e63a263199d20e7aac85e8c5517cf Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Thu, 20 Jan 2022 07:35:07 +0100 Subject: [PATCH 1/3] Use soversion for libreadline in "stripping" page Report on #lfs-support by "r1c0n3r0": the libhistory and libreadline filenames have been wrong on the "stripping" page since realine version bump. Fix taken (with slight modification) from William Harrington's port to arm: https://github.com/cross-lfs/lfs-arm/commit/05a2cd35aac9437bbca6e6dd8921e7037e8eecee --- chapter08/stripping.xml | 4 ++-- packages.ent | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml index 7f775b3d8..772b91c5f 100644 --- a/chapter08/stripping.xml +++ b/chapter08/stripping.xml @@ -68,10 +68,10 @@ done online_usrbin="bash find strip" online_usrlib="libbfd-&binutils-version;.so - libhistory.so.&readline-version; + libhistory.so.&readline-soversion; libncursesw.so.&ncurses-version; libm.so.6 - libreadline.so.&readline-version; + libreadline.so.&readline-soversion; libz.so.&zlib-version; $(cd /usr/lib; find libnss*.so* -type f)" diff --git a/packages.ent b/packages.ent index 4844f5e03..60a458435 100644 --- a/packages.ent +++ b/packages.ent @@ -607,6 +607,7 @@ + From 18c19472981ce1620f605f2b51734f7498f3c8a6 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Thu, 20 Jan 2022 08:18:43 +0100 Subject: [PATCH 2/3] Update to meson-0.61.1 --- chapter01/changelog.xml | 10 ++++++++++ chapter03/patches.xml | 4 ++-- chapter08/meson.xml | 4 ++-- packages.ent | 6 +++--- patches.ent | 2 -- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d806cc721..5fe0564fc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2022-01-20 + + + [pierre] - Update to meson-0.61.1. Fixes + #4985. + + + + 2022-01-17 diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 0986e663d..30107c6ee 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -83,7 +83,7 @@ MD5 sum: &kbd-backspace-patch-md5; - + Compile Meson with the following command: - python3 setup.py build This package does not come with a test suite. diff --git a/packages.ent b/packages.ent index 60a458435..8cb11f3fc 100644 --- a/packages.ent +++ b/packages.ent @@ -491,10 +491,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 99f19cb99..d98eb0d9b 100644 --- a/patches.ent +++ b/patches.ent @@ -58,13 +58,11 @@ ---> -