From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- .../distcc/files/distcc-3.3.3-gcc-10-fix.patch | 28 ++++++++++++ sys-devel/distcc/files/distcc-3.3.3-py38.patch | 53 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch create mode 100644 sys-devel/distcc/files/distcc-3.3.3-py38.patch (limited to 'sys-devel/distcc/files') diff --git a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch new file mode 100644 index 000000000000..2c0bce6c82b6 --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch @@ -0,0 +1,28 @@ +From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001 +From: Romain Geissler +Date: Mon, 27 Jan 2020 09:28:43 +0000 +Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf + https://gcc.gnu.org/gcc-10/porting_to.html) + +This fixes the following link error I see when I use the latest gcc 10 +git branch: +/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here +/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here +collect2: error: ld returned 1 exit status +--- + src/stats.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/stats.h b/src/stats.h +index 9bde285..74d4690 100644 +--- a/src/stats.h ++++ b/src/stats.h +@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, + STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, + STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; + +-const char *stats_text[20]; ++extern const char *stats_text[20]; + + int dcc_stats_init(void); + void dcc_stats_init_kid(void); diff --git a/sys-devel/distcc/files/distcc-3.3.3-py38.patch b/sys-devel/distcc/files/distcc-3.3.3-py38.patch new file mode 100644 index 000000000000..1ba5fee7d87e --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.3.3-py38.patch @@ -0,0 +1,53 @@ +From c52a023b8a17e4346c66a8fddee69b40b327eae7 Mon Sep 17 00:00:00 2001 +From: MartB +Date: Thu, 28 Nov 2019 21:00:59 +0100 +Subject: [PATCH] Replace time.clock() with time.perf_counter() + +.clock() got removed in python 3.8 and was marked as deprecated since 3.3 +(https://github.com/python/cpython/pull/13270) +--- + include_server/parse_file.py | 4 ++-- + include_server/statistics.py | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include_server/parse_file.py b/include_server/parse_file.py +index d1dcc74..f5d78b7 100755 +--- a/include_server/parse_file.py ++++ b/include_server/parse_file.py +@@ -272,7 +272,7 @@ def Parse(self, filepath, symbol_table): + + assert isinstance(filepath, str) + self.filepath = filepath +- parse_file_start_time = time.clock() ++ parse_file_start_time = time.perf_counter() + statistics.parse_file_counter += 1 + + includepath_map_index = self.includepath_map.Index +@@ -338,6 +338,6 @@ def Parse(self, filepath, symbol_table): + expr_includes, next_includes) + + +- statistics.parse_file_total_time += time.clock() - parse_file_start_time ++ statistics.parse_file_total_time += time.perf_counter() - parse_file_start_time + + return (quote_includes, angle_includes, expr_includes, next_includes) +diff --git a/include_server/statistics.py b/include_server/statistics.py +index 9677af3..7bc9cb8 100755 +--- a/include_server/statistics.py ++++ b/include_server/statistics.py +@@ -62,13 +62,13 @@ def StartTiming(): + global start_time, translation_unit_counter + """Mark the start of a request to find an include closure.""" + translation_unit_counter += 1 +- start_time = time.clock() ++ start_time = time.perf_counter() + + + def EndTiming(): + """Mark the end of an include closure calculation.""" + global translation_unit_time, min_time, max_time, total_time +- translation_unit_time = time.clock() - start_time ++ translation_unit_time = time.perf_counter() - start_time + min_time = min(translation_unit_time, min_time) + max_time = max(translation_unit_time, max_time) + total_time += translation_unit_time -- cgit v1.2.3