From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 463CA15808B for ; Tue, 12 Apr 2022 06:58:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CEC6E0921; Tue, 12 Apr 2022 06:58:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 911A9E0917 for ; Tue, 12 Apr 2022 06:58:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E7283419A7 for ; Tue, 12 Apr 2022 06:58:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E162355 for ; Tue, 12 Apr 2022 06:58:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649746638.d092dfd7485f030626d55087e004e3996f0986e4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.15.6.ebuild net-fs/samba/samba-4.16.0.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d092dfd7485f030626d55087e004e3996f0986e4 X-VCS-Branch: master Date: Tue, 12 Apr 2022 06:58:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d61198fa-ae42-4b31-9241-d0e178fa70b0 X-Archives-Hash: 510a11a94e209d0ff1eac37bb9f63f31 commit: d092dfd7485f030626d55087e004e3996f0986e4 Author: Sam James gentoo org> AuthorDate: Tue Apr 12 06:57:18 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 12 06:57:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d092dfd7 net-fs/samba: fix race condition during build It's a bit gross but no different from having to force -j1 if upstream clearly aren't testing w/ it. Upstream force PYTHONHASHSEED=1 (which gives determinism) in their builds, so we need to as well, to avoid confusing failures. Closes: https://bugs.gentoo.org/836167 Acked-by: David Seifert gentoo.org> Thanks-to: Marien Zwart gmail.com> Signed-off-by: Sam James gentoo.org> net-fs/samba/samba-4.15.6.ebuild | 6 +++--- net-fs/samba/samba-4.16.0.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-fs/samba/samba-4.15.6.ebuild b/net-fs/samba/samba-4.15.6.ebuild index 2d8b250202b8..fc12bd068d9e 100644 --- a/net-fs/samba/samba-4.15.6.ebuild +++ b/net-fs/samba/samba-4.15.6.ebuild @@ -249,16 +249,16 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } multilib_src_compile() { - waf-utils_src_compile + PYTHONHASHSEED=1 waf-utils_src_compile } multilib_src_install() { - waf-utils_src_install + PYTHONHASHSEED=1 waf-utils_src_install # Make all .so files executable find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die diff --git a/net-fs/samba/samba-4.16.0.ebuild b/net-fs/samba/samba-4.16.0.ebuild index acbdab767d9f..54d617f29c82 100644 --- a/net-fs/samba/samba-4.16.0.ebuild +++ b/net-fs/samba/samba-4.16.0.ebuild @@ -250,16 +250,16 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } multilib_src_compile() { - waf-utils_src_compile + PYTHONHASHSEED=1 waf-utils_src_compile } multilib_src_install() { - waf-utils_src_install + PYTHONHASHSEED=1 waf-utils_src_install # Make all .so files executable find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die