summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-12-28 09:08:56 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-12-28 09:08:56 +0000
commit71eb2b215b465fd440139f89e28ee88a40d5aaa6 (patch)
treec50905341e680315569fd67b95435657afa93e18 /sys-devel
parentAdded patch to honor CFLAGS_${ABI}. It's commented out in the ebuild pending... (diff)
downloadgentoo-2-71eb2b215b465fd440139f89e28ee88a40d5aaa6.tar.gz
gentoo-2-71eb2b215b465fd440139f89e28ee88a40d5aaa6.tar.bz2
gentoo-2-71eb2b215b465fd440139f89e28ee88a40d5aaa6.zip
Added code for the 'distcc as argv[0]' case.
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/distcc/files/distcc-gentoo-multilib.patch18
1 files changed, 16 insertions, 2 deletions
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
index cc17764fdc5a..af4abf2b06f1 100644
--- 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;