From 56c7dd05ed202d0af1d10491babd39837474dead Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 20 Aug 2016 18:31:08 +0200 Subject: [PATCH] distcc: adjust elf.h code for gcc2 --- sys-devel/distcc/patches/distcc-3.1.patchset | 39 +++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/sys-devel/distcc/patches/distcc-3.1.patchset b/sys-devel/distcc/patches/distcc-3.1.patchset index be112bb7e..784717743 100644 --- a/sys-devel/distcc/patches/distcc-3.1.patchset +++ b/sys-devel/distcc/patches/distcc-3.1.patchset @@ -1,4 +1,4 @@ -From b7900aa5d892e827273b4bca72f924e388eafa33 Mon Sep 17 00:00:00 2001 +From f89411fce92ef7e42b61dadf647b793dc9272d1e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 30 Sep 2013 21:16:54 +0200 Subject: Convert existing patch to git patchset. @@ -109,10 +109,10 @@ index 8d2df86..bd92d4f 100644 return 0; } -- -1.8.3.4 +2.7.0 -From bbd4bfc3c4fed20c3de6e658c7b320dfd79bc07f Mon Sep 17 00:00:00 2001 +From f445ad057cc38e737559c337d248442471d5865d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 1 Oct 2013 17:26:29 +0200 Subject: C89 fixes for gcc2 compatibility @@ -193,10 +193,10 @@ index 2cbca66..50f10c8 100644 if (rlim.rlim_cur < (rlim_t)n + 10) { rlim.rlim_cur = (rlim_t)n + 10; -- -1.8.3.4 +2.7.0 -From 3cebb13f9c66f7eada51f992b67697f3bb0b50e4 Mon Sep 17 00:00:00 2001 +From fc0842c18fe7a894a210d3ca95fd56325365246b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 18 Sep 2014 09:53:05 +0200 Subject: strings.h fix. @@ -215,5 +215,32 @@ index 9b23b38..f19157c 100644 #include "distcc.h" -- -1.8.3.4 +2.7.0 + + +From 751c147c8f4d343b533be76c6831923ba7535bbd Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 20 Aug 2016 16:27:52 +0200 +Subject: distcc: fix gcc2build again + +elf.h is now available so we need this code to work. + +diff --git a/src/fix_debug_info.c b/src/fix_debug_info.c +index d529c4f..fa398fe 100644 +--- a/src/fix_debug_info.c ++++ b/src/fix_debug_info.c +@@ -435,8 +435,10 @@ int dcc_fix_debug_info(const char *path, const char *client_path, + */ + size_t client_path_len = strlen(client_path); + size_t server_path_len = strlen(server_path); ++ char *client_path_plus_slashes; ++ + assert(client_path_len <= server_path_len); +- char *client_path_plus_slashes = malloc(server_path_len + 1); ++ client_path_plus_slashes = malloc(server_path_len + 1); + if (!client_path_plus_slashes) { + rs_log_crit("failed to allocate memory"); + return 1; +-- +2.7.0