gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 19:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from trunk to multilib

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11988 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2020-06-29 08:18:13 +00:00
parent c4804e888b
commit d6174d9668
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
appendices/dependencies.xml
View File

@ -680,7 +680,9 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>None</seg> <seg>
<ulink url="&blfs-root;view/stable/general/tk.html">tk</ulink>
</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1241,7 +1243,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1348,7 +1350,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1456,7 +1458,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -1491,7 +1493,7 @@
<segtitle>&testsuites;</segtitle> <segtitle>&testsuites;</segtitle>
<seglistitem> <seglistitem>
<seg>No test suite available</seg> <seg>None</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

3
chapter02/hostreqs.xml
View File

@ -157,7 +157,6 @@
<para >To see whether your host system has all the appropriate versions, and <para >To see whether your host system has all the appropriate versions, and
the ability to compile programs, run the following:</para> the ability to compile programs, run the following:</para>
<!-- ANY additional lines in the script cause a pdf rendering problem-->
<screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF" <screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
<literal>#!/bin/bash <literal>#!/bin/bash
# Simple script to list version numbers of critical development tools # Simple script to list version numbers of critical development tools
@ -208,7 +207,7 @@ sed --version | head -n1
tar --version | head -n1 tar --version | head -n1
makeinfo --version | head -n1 # texinfo version makeinfo --version | head -n1 # texinfo version
xz --version | head -n1 xz --version | head -n1
<?hard-pagebreak?>
echo 'int main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c echo 'int main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c
if [ -x dummy ] if [ -x dummy ]
then echo "g++ compilation OK"; then echo "g++ compilation OK";