summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-05-31 11:33:12 +0200
committerMichał Górny <mgorny@gentoo.org>2020-05-31 11:44:08 +0200
commitd8b0e7c0e5c4d7c2a26f70492c959d2b910eb3b7 (patch)
tree19e1d6c525d8073eba1285aef880861bac082d19 /sys-devel/distcc
parentsys-devel/distcc: Fix tests (diff)
downloadgentoo-d8b0e7c0e5c4d7c2a26f70492c959d2b910eb3b7.tar.gz
gentoo-d8b0e7c0e5c4d7c2a26f70492c959d2b910eb3b7.tar.bz2
gentoo-d8b0e7c0e5c4d7c2a26f70492c959d2b910eb3b7.zip
sys-devel/distcc: Port to py38&39
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-devel/distcc')
-rw-r--r--sys-devel/distcc/distcc-3.3.3-r1.ebuild4
-rw-r--r--sys-devel/distcc/files/distcc-3.3.3-py38.patch53
2 files changed, 56 insertions, 1 deletions
diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index d7992e1b301..3ab5ecab6d3 100644
--- a/sys-devel/distcc/distcc-3.3.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools flag-o-matic python-single-r1 systemd \
toolchain-funcs user xdg-utils prefix
@@ -53,6 +53,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
# SOCKSv5 support needed for Portage, bug #537616
eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+ # backport py3.8 fixes
+ eapply "${FILESDIR}/${P}-py38.patch"
eapply_user
# Bugs #120001, #167844 and probably more. See patch for description.
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 00000000000..1ba5fee7d87
--- /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 <mart.b@outlook.de>
+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