Explorar el Código

Update to meson-0.47.1

Xi Ruoyao hace 7 años
padre
commit
de7f7d938a
Se han modificado 3 ficheros con 8 adiciones y 15 borrados
  1. 5 1
      chapter01/changelog.xml
  2. 0 11
      chapter06/meson.xml
  3. 3 3
      packages.ent

+ 5 - 1
chapter01/changelog.xml

@@ -44,12 +44,16 @@
     <listitem>
       <para>2018-07-18</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - 更新到 meson-0.47.1。修复
+          <ulink url="&lfs-ticket-root;4313">#4313</ulink>。</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - 记录一些新的退化测试失败。</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - 更新到 linux-4.17.8。修复
-          <ulink url="&lfs-ticket-root;4310">#4312</ulink>。</para>
+          <ulink url="&lfs-ticket-root;4312">#4312</ulink>。</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - 更新到 e2fsprogs-1.44.3。修复

+ 0 - 11
chapter06/meson.xml

@@ -40,10 +40,6 @@
   <sect2 role="installation">
     <title>安装 Meson</title>
 
-    <para>应用一个来自上游的修补:</para>
-
-<screen><userinput remap="pre">sed -i '309 s/os.getcwd/-C, &amp;/' mesonbuild/minstall.py</userinput></screen>
-
     <para>执行以下命令编译 Meson:</para>
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
@@ -54,13 +50,6 @@
 
 <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>
--->
 
     <variablelist>
       <title>安装选项的含义:</title>

+ 3 - 3
packages.ent

@@ -470,10 +470,10 @@
 <!ENTITY man-pages-ch6-du "27 MB">
 <!ENTITY man-pages-ch6-sbu "不到 0.1 SBU">
 
-<!ENTITY meson-version "0.47.0">
-<!ENTITY meson-size "1,218 KB">
+<!ENTITY meson-version "0.47.1">
+<!ENTITY meson-size "1,221 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "5ec10121fcd1e130fdc7e9a10d762a4c">
+<!ENTITY meson-md5 "5ed95fd4e9c7634f7cf3482d352804e7">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "16 MB">
 <!ENTITY meson-ch6-sbu "0.1 SBU">