diff options
| author | Douglas R. Reno <renodr@linuxfromscratch.org> | 2019-12-10 15:50:31 +0000 |
|---|---|---|
| committer | Douglas R. Reno <renodr@linuxfromscratch.org> | 2019-12-10 15:50:31 +0000 |
| commit | 1a96e748cbd53e2434788d029e279765a804bfc6 (patch) | |
| tree | d785aba2f3b7a102f9b91e2987c8a7d933d44e9b | |
| parent | b7b0eea7be0c0245d4f55dd5fd44a7143d907815 (diff) | |
Add a sed to meson for a regression fix.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11708 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter06/meson.xml | 4 | ||||
| -rw-r--r-- | general.ent | 6 |
3 files changed, 17 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d8e084680..0ed3c2115 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,16 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2019-12-10</para> + <itemizedlist> + <listitem> + <para>[renodr] - Fix a regression in meson that was causing problems + in dependent packages.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2019-12-05</para> <itemizedlist> <listitem revision="systemd"> diff --git a/chapter06/meson.xml b/chapter06/meson.xml index 820ccd7f1..db3d67afc 100644 --- a/chapter06/meson.xml +++ b/chapter06/meson.xml @@ -40,6 +40,10 @@ <sect2 role="installation"> <title>Installation of Meson</title> + <para>Apply a fix from upstream to fix a regression:</para> + +<screen><userinput remap="pre">sed -i "s@isfile(f)@& and not f.startswith('/dev')@" mesonbuild/interpreter.py</userinput></screen> + <para>Compile Meson with the following command:</para> <screen><userinput remap="make">python3 setup.py build</userinput></screen> diff --git a/general.ent b/general.ent index cf7c67b93..8e9e5faa5 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20191205"> +<!ENTITY version "SVN-20191210"> <!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 versiond "20191205-systemd"> +<!ENTITY versiond "20191210-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "December 5th, 2019"> +<!ENTITY releasedate "December 10th, 2019"> <!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "9.0"> |