Просмотр исходного кода

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
Douglas R. Reno 5 лет назад
Родитель
Сommit
1a96e748cb
3 измененных файлов с 17 добавлено и 3 удалено
  1. 10 0
      chapter01/changelog.xml
  2. 4 0
      chapter06/meson.xml
  3. 3 3
      general.ent

+ 10 - 0
chapter01/changelog.xml

@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     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>

+ 4 - 0
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)@&amp; 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>

+ 3 - 3
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 &ndash; -->
 <!ENTITY milestone       "9.0">