1
0

automake.xml.rej 1.3 KB

123456789101112131415161718192021222324252627282930
  1. --- chapter06/automake.xml
  2. +++ chapter06/automake.xml
  3. @@ -49,17 +49,19 @@
  4. <screen><userinput remap="make">make</userinput></screen>
  5. - <para>有一些测试不正确地链接到 flex 库的错误版本,
  6. - 因此我们暂时绕过这一问题。另外,由于测试内部的时延,
  7. - 即使在仅有单处理器的系统上,也使用 -j4 选项加速测试。
  8. - 运行下列命令以测试编译结果:</para>
  9. + <para> 由于单个测试点中存在的内部时延,即使仅有一个处理器,
  10. + 也应该使用 make 命令的 -j4 选项加速测试。输入以下命令测试编译结果:
  11. + </para>
  12. -<screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &amp;:" t/lex-{clean,depend}-cxx.sh
  13. -make -j4 check</userinput></screen>
  14. + <!--<screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &amp;:" t/lex-{clean,depend}-cxx.sh
  15. + make -j4 check</userinput></screen>-->
  16. - <para>已知两个测试在 LFS 环境中会失败:
  17. - check12.sh 和 check12-w.sh。</para>
  18. +<screen><userinput remap="test">make -j4 check</userinput></screen>
  19. +<!-- All tests pass now.
  20. + <para>Two tests are known to fail in the LFS environment:
  21. + check12.sh and check12-w.sh.</para>
  22. +-->
  23. <para>安装该软件包:</para>
  24. <screen><userinput remap="install">make install</userinput></screen>