diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2018-07-08 20:23:05 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2018-07-08 20:23:05 +0000 |
| commit | d47b15b7e026d05e55173b537b5814ac4085ea76 (patch) | |
| tree | d518d070ef030f828df82f7480b2ec5361f4d85e /chapter06 | |
| parent | b8b65b7be795a5efd9db3a974d02f777b6799806 (diff) | |
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
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/meson.xml | 27 | ||||
| -rw-r--r-- | chapter06/texinfo.xml | 4 |
2 files changed, 28 insertions, 3 deletions
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 @@ <sect2 role="installation"> <title>Installation of Meson</title> + <para>Make a fix from upstream:</para> + +<screen><userinput remap="pre">sed -i '309 s/os.getcwd/-C, &/' mesonbuild/minstall.py</userinput></screen> + <para>Compile Meson with the following command:</para> <screen><userinput remap="make">python3 setup.py build</userinput></screen> @@ -48,16 +52,33 @@ <para>Install the package:</para> -<screen><userinput remap="install">python3 setup.py install</userinput></screen> - +<screen><userinput remap="install">python3 setup.py install --root=dest +cp -rv dest/* /</userinput></screen> +<!-- <para>At last, move Meson man pages to correct location:</para> <screen><userinput remap="install">mv -v /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share/man/man1/*.1 \ /usr/share/man/man1 rm -r /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share</userinput></screen> +--> - </sect2> + <variablelist> + <title>The meaning of the install parameters:</title> + + <varlistentry> + <term><parameter>--root=dest</parameter></term> + <listitem> + <para>By default <command>python3 setup.py install</command> + installs various files (such as man pages) into Python Eggs. + With a specified root location, <command>setup.py</command> installs + these files into a standard hierarchy. Then we can just copy + the hierarchy so the files will be in the standard location. + </para> + </listitem> + </varlistentry> + </variablelist> + </sect2> <sect2 id="contents-meson" role="content"> <title>Contents of Meson</title> 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 @@ <sect2 role="installation"> <title>Installation of Texinfo</title> + <para>Fix a file that creates a lot of failures in the regression checks:</para> + +<screen><userinput remap="pre">sed -i '5481,5485 s/({/(\\{/' tp/Texinfo/Parser.pm</userinput></screen> + <para>Prepare Texinfo for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen> |