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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B0C5139345 for ; Fri, 2 Jul 2021 05:05:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B680DE084A; Fri, 2 Jul 2021 05:05:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95E64E0845 for ; Fri, 2 Jul 2021 05:05:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 357EF3409D8 for ; Fri, 2 Jul 2021 05:05:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E99A7A1 for ; Fri, 2 Jul 2021 05:05:14 +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: <1625201444.1c3eb3b0aeb7e3600297b21f3495f1f6f21b1702.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/botan/botan-2.17.3-r1.ebuild dev-libs/botan/botan-2.18.1-r1.ebuild X-VCS-Directories: dev-libs/botan/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1c3eb3b0aeb7e3600297b21f3495f1f6f21b1702 X-VCS-Branch: master Date: Fri, 2 Jul 2021 05:05:14 +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: 1bc7dcaa-46fe-4e75-bc62-53ceae5512c6 X-Archives-Hash: e908b46aa36440b2b1e86a46a424a039 commit: 1c3eb3b0aeb7e3600297b21f3495f1f6f21b1702 Author: Sam James gentoo org> AuthorDate: Fri Jul 2 04:50:24 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 2 04:50:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3eb3b0 dev-libs/botan: use correct Python implementation for build (fix -native-symlinks) As per the Python guide [0], we can call python_setup for additional build-time usage. We also use ${EPYTHON} to call configure.py instead of relying on the shebang and possible python-exec magic. (The configure script passes on the executable it was called with for later use too.) [0] https://dev.gentoo.org/~mgorny/python-guide/multi.html#additional-build-time-python-use Closes: https://bugs.gentoo.org/765631 Signed-off-by: Sam James gentoo.org> dev-libs/botan/botan-2.17.3-r1.ebuild | 4 +++- dev-libs/botan/botan-2.18.1-r1.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-libs/botan/botan-2.17.3-r1.ebuild b/dev-libs/botan/botan-2.17.3-r1.ebuild index 2bb63cd2ae7..9900e923b2a 100644 --- a/dev-libs/botan/botan-2.17.3-r1.ebuild +++ b/dev-libs/botan/botan-2.17.3-r1.ebuild @@ -53,6 +53,8 @@ python_check_deps() { } src_configure() { + python_setup + local disable_modules=() use boost || disable_modules+=( "boost" ) use bindist && disable_modules+=( "ecdsa" ) @@ -112,7 +114,7 @@ src_configure() { tc-export CC CXX AR - ./configure.py "${myargs[@]}" || die "configure.py failed" + ${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}" } src_test() { diff --git a/dev-libs/botan/botan-2.18.1-r1.ebuild b/dev-libs/botan/botan-2.18.1-r1.ebuild index 5f66e51f3aa..0e5c78c36a5 100644 --- a/dev-libs/botan/botan-2.18.1-r1.ebuild +++ b/dev-libs/botan/botan-2.18.1-r1.ebuild @@ -59,6 +59,8 @@ python_check_deps() { } src_configure() { + python_setup + local disable_modules=( $(usex boost '' 'boost') $(usex bindist 'ecdsa' '') @@ -147,7 +149,7 @@ src_configure() { tc-export CC CXX AR - ./configure.py "${myargs[@]}" || die "configure.py failed" + ${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}" } src_test() {