Attachment 47704 Details for Bug 76493 – Patch for distcc.xml

[patch] Patch for distcc.xml

distcc.diff (text/plain), 4.63 KB, created by Demetrio Aspiras on 2005-01-05 06:42:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Demetrio Aspiras

Created: 2005-01-05 06:42:55 UTC

Size: 4.63 KB

patch

obsolete

>--- distccold.xml	2005-01-04 23:01:59.793973712 -0500
>+++ distcc.xml	2005-01-04 22:54:01.500685344 -0500
>@@ -48,7 +48,7 @@
> 
> 
> Distcc is a program designed to distribute compiling tasks across a network to 
>-participating hosts. It is comprised of a server, <c>distccd</c> and a client
>+participating hosts. It is comprised of a server, <c>distccd</c>, and a client
> program, <c>distcc</c>. Distcc can work transparently with <uri link="http://ccache.samba.org">ccache</uri> and Portage with a little work.
> 
> 
>@@ -60,8 +60,8 @@
> 
> 
> If you are planning on using distcc to help you bootstrap a Gentoo installation,
>-make sure you read the part on <uri link="#bootstrapping">Using distcc to 
>-Bootstrap</uri> which is situated further down in this document.
>+make sure you read the section <uri link="#bootstrapping">Using distcc to 
>+Bootstrap</uri>, which is situated further down in this document.
> 
> 
> </body>
>@@ -75,9 +75,9 @@
> <body>
> 
> 
>-To start off with, to use Distcc all of the computers on your network need to 
>-have the same GCC versions. Mixing 3.3.x (where the x varies) is okay, but 
>-mixing 3.3.x and 3.2.x is not: your programs will have errors in it.
>+In order to use Distcc, all of the computers on your network need to 
>+have the same GCC versions. Mixing 3.3.x (where the x varies) is okay, but 
>+mixing 3.3.x and 3.2.x will result in your programs having errors in them.
> 
> 
> </body>
>@@ -87,7 +87,7 @@
> <body>
> 
> 
>-There are a couple of options you should know about before you start 
>+There are a couple of options you should be aware of before you start 
> installing distcc.
> 
> 
>@@ -109,7 +109,7 @@
> <body>
> 
> 
>-Setting up distcc is easy to do with Portage. Execute the following steps on 
>+Setting up Portage to use distcc is easy. Execute the following steps on 
> each system that should participate in the distributed compiling:
> 
> 
>@@ -123,9 +123,14 @@
> FEATURES="distcc"
> </pre>
> 
>+</body>
>+</section>
>+<section>
>+<title>Specifying Participating Hosts</title>
>+<body>
>+
> 
>-Next you have to specify what hosts you want to use. Use the 
>-<c>distcc-config</c> command to set the list of hosts. Here is an example of 
>+Use the <c>distcc-config</c> command to set the list of hosts. Here is an example of 
> some hosts that might be in your list:
> 
> 
>@@ -166,11 +171,10 @@
> 
> 
> Edit <path>/etc/conf.d/distccd</path> to your needs and be sure to set the
>-<c>--allow</c> directive to allow only hosts you trust. For more information
>-please see the <uri link="http://distcc.samba.org/security.html">Distcc Security
>-Design</uri>. For added security you should also use the <c>--listen</c> 
>-directive to tell the Distcc daemon what IP to listen on (for multi-homed 
>-systems).
>+<c>--allow</c> directive to allow only hosts you trust. For added security, you should also use the <c>--listen</c> 
>+directive to tell the distcc daemon what IP to listen on (for multi-homed 
>+systems). More information on distcc security can be found at <uri link="http://distcc.samba.org/security.html">Distcc Security
>+Design</uri>.
> 
> 
> 
>@@ -191,7 +195,7 @@
> <body>
> 
> 
>-This is in some cases easier than the Portage setup. What you have to do is 
>+This is, in some cases, easier than the Portage setup. What you have to do is 
> update your <c>PATH</c> variable to include <path>/usr/lib/distcc/bin</path>
> in front of the directory that contains <c>gcc</c> (<path>/usr/bin</path>). 
> However, there is a caveat. If you use ccache you have to put distcc after 
>@@ -230,12 +234,12 @@
> </body>
> </section>
> <section>
>-<title>An Introduction to Cross-compiling</title>
>+<title>An Introduction to Cross-Compiling</title>
> <body>
> 
> 
>-If you want to give Cross-compiling a try you can to follow <uri link="http://dev.gentoo.org/~vapier/CROSS-COMPILE-HOWTO">The Cross Compile 
>-HOWTO</uri>; Crossdev is depreciated.
>+If you want to give cross-compiling a try, you can read <uri link="http://dev.gentoo.org/~vapier/CROSS-COMPILE-HOWTO">The Cross Compile 
>+HOWTO</uri>; Crossdev is deprecated.
> 
> 
> </body>
>@@ -311,14 +315,14 @@
> </pre> 
> 
> 
>-distcc is now set up to bootstrap! Continue the official installation 
>+Distcc is now set up to bootstrap! Continue with the official installation 
> instructions and <e>do not forget</e> to re-emerge distcc after <c>emerge 
> system</c>. This is to make sure that all of the dependencies you want are 
> installed as well.
> 
> 
> <note>
>-During bootstrap and <c>emerge system</c> Distcc may not appear to be used. 
>+During bootstrap and <c>emerge system</c> distcc may not appear to be used. 
> This is expected as some ebuilds do not work well with distcc, so they 
> intentionally disable it.
> </note>

Actions: View | Diff

Attachments on bug 76493: 47704