From d47b15b7e026d05e55173b537b5814ac4085ea76 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 8 Jul 2018 20:23:05 +0000 Subject: [PATCH] Fix failures in texinfo regression tests. Update to linux-4.17.5. Update to meson-0.47.0. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11436 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 17 +++++++++++++++++ chapter06/meson.xml | 27 ++++++++++++++++++++++++--- chapter06/texinfo.xml | 4 ++++ general.ent | 6 +++--- packages.ent | 12 ++++++------ 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6c16d292c..1fbcd903a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,23 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2018-07-08 + + + [bdubbs] - Fix failures in texinfo regression tests. + + + [bdubbs] - Update to linux-4.17.5. Fixes + #4300. + + + [bdubbs] - Update to meson-0.47.0. Fixes + #4306. + + + + 2018-07-07 diff --git a/chapter06/meson.xml b/chapter06/meson.xml index fed402f46..b0410392b 100644 --- a/chapter06/meson.xml +++ b/chapter06/meson.xml @@ -40,6 +40,10 @@ Installation of Meson + Make a fix from upstream: + +sed -i '309 s/os.getcwd/-C, &/' mesonbuild/minstall.py + Compile Meson with the following command: python3 setup.py build @@ -48,17 +52,34 @@ Install the package: -python3 setup.py install - +python3 setup.py install --root=dest +cp -rv dest/* / + + + The meaning of the install parameters: + + + --root=dest + + By default python3 setup.py install + installs various files (such as man pages) into Python Eggs. + With a specified root location, setup.py installs + these files into a standard hierarchy. Then we can just copy + the hierarchy so the files will be in the standard location. + + + + + - Contents of Meson diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index 11a9eed06..97a5a9931 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -41,6 +41,10 @@ Installation of Texinfo + Fix a file that creates a lot of failures in the regression checks: + +sed -i '5481,5485 s/({/(\\{/' tp/Texinfo/Parser.pm + Prepare Texinfo for compilation: ./configure --prefix=/usr --disable-static diff --git a/general.ent b/general.ent index 6bc6c6703..79b13f69b 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index f1c324b4d..f044ffe05 100644 --- a/packages.ent +++ b/packages.ent @@ -416,12 +416,12 @@ - + - + - +