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 --- sys-devel/distcc/Manifest | 6 ++- sys-devel/distcc/distcc-3.3.3-r1.ebuild | 41 ++++++++--------- .../distcc/files/distcc-3.3.3-gcc-10-fix.patch | 28 ++++++++++++ sys-devel/distcc/files/distcc-3.3.3-py38.patch | 53 ++++++++++++++++++++++ sys-devel/distcc/metadata.xml | 4 -- 5 files changed, 105 insertions(+), 27 deletions(-) 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') diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index a59c483373b4..5c778c968853 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,6 +1,8 @@ AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14 AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860 AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c +AUX distcc-3.3.3-gcc-10-fix.patch 1378 BLAKE2B 4c91ceddba6ed1745ab564a505e354e8b54b59cc73077ac74367e7dbac53aa0953c58a6fd4550253beb183081d739f0b52cdb9f89e376ee425d9d9d34e5ea72d SHA512 cf2ba6b3a840bde6acb4d389e5f8aec6413cc2608d4c9786f4bc6ea746966cbde7653cdfb92b21050f938c36fee2e43722f6b65204878fca1d72ffb6c07ba1e0 +AUX distcc-3.3.3-py38.patch 2129 BLAKE2B a81c190d73ddf8c679640696be9aa66bd0f3095c03af431864cc8e5cba2cf74d2525065c4bd53fc7258dcaeba5a7ed20995b11fe08c8b02164e3cfa520c83819 SHA512 958c099906be21d094bdda04445dbc5471d519e198d7f9c0d619f819978e57dee3ca664a2df048398e551a31cb107ffa7bdcd003ec0c979441440f8dcfb33dc1 AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee1283db9c000d12ab29a90d1813df2a590f87c02520e312c35901a7d3f1364480b68bb02d668d51d SHA512 fe3dee7a89ec16e103b52d3555d483b42e4cbe716e3e77f792c543fb2c82eca5f6b8e0d2809f16c805d55263471108ff2dea1f4a5d55826f67f8b94239aca946 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057 AUX distccd.confd 1328 BLAKE2B d6a4756afbe7813733227091028e1db570371750bd22dedbfb66e4d86e995138cdc3a63c853b5674c8678bf0475d7276c45f74b40ac916d060760f06ac3fdf73 SHA512 e6ff0547892b9e7a255afeb56eb07516e4b328d86d5d987872f1bf24a973132544e9f17195e5f8827305218429adb1c5290cde3ef1c094efd035592cbdde7eec @@ -8,5 +10,5 @@ AUX distccd.initd 374 BLAKE2B 48011f19225536311701250470011bc1c1be16f2400831964d AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135 -EBUILD distcc-3.3.3-r1.ebuild 5604 BLAKE2B d12b6a070398a8cd3a4e9092b658b8c73b54433fce38e6519e0acbaf5d540226bfac16f7ddefb38763fa43f8e2b2a6e702ec4d7db7475e6ff8300fada2315224 SHA512 3efed456bd9834de8efd5ffd5b34c40f7de786f1e17ce903ff2e017298fba702a099ba76af5ff547ae458ec751d6c264f6115144a3bdef489622ee0bda663a63 -MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f +EBUILD distcc-3.3.3-r1.ebuild 5719 BLAKE2B d690a98ea23d743cadbee205d689feb9d1c30e8dfc39d347f53ec2e887802c3bfae92bb99a786459748edebd85ff557edf3c76169048baafe16d341d8b5cb069 SHA512 d5bf5a823ce19a166e9ac4a39486991bd9d442572c2ffcc194c7ce9c516331acbbe35afdcb627462624cbd0cf09b97742aa0907b6cb5f499d6b0957040202b6d +MISC metadata.xml 459 BLAKE2B 8d2380ff1e55bf6e7201ea0ab2e4c6866b9c84c1eecef23470e9aa177279f94695c65c4d50cd5ffbb3d98c90ec9a712d9aed96c16238f2eb3c09d1bc5c6d4bae SHA512 dff25af7ec7895d4d2e3f3886614b227a9b62c4376d1736c61ce70e5cdae00124128ee78e89a31c9bc25cff3bc6c3826543ca8ebaf255a74c4611caabe9de1f8 diff --git a/sys-devel/distcc/distcc-3.3.3-r1.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild index fd9f3fafc19f..f4d8d84f5eca 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 @@ -15,18 +15,10 @@ SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf" - -RESTRICT="test" +IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf" CDEPEND="${PYTHON_DEPS} dev-libs/popt - gnome? ( - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - x11-libs/gtk+:2 - x11-libs/pango - ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) @@ -36,7 +28,6 @@ DEPEND="${CDEPEND} sys-libs/binutils-libs virtual/pkgconfig" RDEPEND="${CDEPEND} - !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) @@ -55,6 +46,10 @@ 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" + # gcc-10 fix, #707502 + eapply "${FILESDIR}/${P}-gcc-10-fix.patch" eapply_user # Bugs #120001, #167844 and probably more. See patch for description. @@ -70,6 +65,9 @@ src_prepare() { -e "s:@libdir@:/usr/lib:" \ "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die + # TODO: gdb tests fail due to gdb failing to find .c file + sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die + hprefixify update-distcc-symlinks.py src/{serve,daemon}.c python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config" eautoreconf @@ -81,7 +79,7 @@ src_configure() { --libdir=/usr/lib $(use_enable ipv6 rfc2553) $(use_with gtk) - $(use_with gnome) + --without-gnome $(use_with gssapi auth) $(use_with zeroconf avahi) ) @@ -89,9 +87,16 @@ src_configure() { econf "${myconf[@]}" } +src_test() { + # sandbox breaks some tests, and hangs some too + # retest once #590084 is fixed + local -x SANDBOX_ON=0 + emake -j1 check +} + src_install() { # override GZIP_BIN to stop it from compressing manpages - emake DESTDIR="${D}" GZIP_BIN=false install + emake -j1 DESTDIR="${D}" GZIP_BIN=false install python_optimize newinitd "${FILESDIR}/distccd.initd" distccd @@ -127,7 +132,7 @@ src_install() { dobin "${T}/distcc-config" - if use gnome || use gtk; then + if use gtk; then einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" einfo "This is to have a little sensability in naming schemes between distccmon programs" mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die @@ -160,8 +165,6 @@ pkg_postinst() { eselect compiler-shadow update distccd fi - use gnome && xdg_desktop_database_update - elog elog "Tips on using distcc with Gentoo can be found at" elog "https://wiki.gentoo.org/wiki/Distcc" @@ -172,7 +175,7 @@ pkg_postinst() { elog "To use the distccmon programs with Gentoo you should use this command:" elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" - if use gnome || use gtk; then + if use gtk; then elog "Or:" elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" fi @@ -190,7 +193,3 @@ pkg_prerm() { eselect compiler-shadow remove distcc fi } - -pkg_postrm() { - use gnome && xdg_desktop_database_update -} 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 diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml index 0b9bbc941d2d..8c6bdf64be99 100644 --- a/sys-devel/distcc/metadata.xml +++ b/sys-devel/distcc/metadata.xml @@ -9,10 +9,6 @@ cluster@gentoo.org Gentoo Cluster Project - - Distcc is a program to distribute compilation of C code across several - machines on a network. - Enable support for net-libs/libgssglue -- cgit v1.2.3