Added code for the 'distcc as argv[0]' case.

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index dddad7a43783bac450e350f323684b51fb9bdb11..18057262a987764635ab070090dfc770827995a9 100644 (file)
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 MD5 11b850e6889949d5cdc67d35d982db44 ChangeLog 23786
+MD5 19d88c612c82c68e8c9393933cc02646 distcc-2.18.3.ebuild 5008
 MD5 fdc538f8cbd4354cd059f94668bcfef3 distcc-2.16-r2.ebuild 4847
 MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375
-MD5 19d88c612c82c68e8c9393933cc02646 distcc-2.18.3.ebuild 5008
 MD5 b634e8c42c191a882dab36a1e1fddd7b distcc-2.17-r1.ebuild 5169
 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3 66
 MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64
-MD5 2823938220f7e53be1d5c6938bb46725 files/distcc-gentoo-multilib.patch 3364
+MD5 d939dfd2b17a6e52a1519151c4619dcf files/distcc-gentoo-multilib.patch 3780
 MD5 af5f3983a736bd552e83d92ac9955a03 files/digest-distcc-2.17-r1 64
 MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
 MD5 bb53a18e009ef62f4402a23f83bfda20 files/2.18/conf 1384
@@ -19,7 +19,7 @@ MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB0R6VArHZZzCEUG0RAmg9AJ9SbRCj869/m5UL/ywZKPGf0OgkOQCggG0h
-27j4UWmMwZY3nOR+bVVh9zU=
-=mZb8
+iD8DBQFB0SKyArHZZzCEUG0RAucnAJ4hMsDCxz3HJ0C+vDkzuJ5dXhq6swCfbGjJ
+O1d06JfzpvTJXyehIqjgDGQ=
+=h1jk
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
index cc17764fdc5a8e8fc6036ee842a7fb6f1d2fd20e..af4abf2b06f1defdaffc40b984114bd873f34821 100644 (file)
--- a/sys-devel/distcc/files/distcc-gentoo-multilib.patch
+++ b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
@@ -1,6 +1,6 @@
 diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
 --- distcc-2.18.3-vanilla/src/distcc.c 2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c 2004-12-28 00:39:10.101746859 -0800
++++ distcc-2.18.3/src/distcc.c 2004-12-28 01:04:51.017574246 -0800
 @@ -135,7 +135,86 @@
      signal(SIGHUP, &dcc_client_signalled);
  }
@@ -96,7 +96,21 @@ diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
      int ret;
  
      dcc_client_catch_signals();
-@@ -200,7 +280,12 @@
+@@ -183,7 +263,12 @@
+             goto out;
+         }
+         
+-        dcc_find_compiler(argv, &compiler_args);
++        if(!(newargv = getNewArgv(argv))) {
++            ret = EXIT_OUT_OF_MEMORY;
++            goto out;
++        }
++        dcc_find_compiler(newargv, &compiler_args);
++        free(newargv);
+         /* compiler_args is now respectively either "cc -c hello.c" or
+          * "gcc -c hello.c" */
+ 
+@@ -200,7 +285,12 @@
                                            &tweaked_path)) != 0)
              goto out;