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 8C44C158089 for ; Wed, 11 Oct 2023 05:21:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AE9E2BC01D; Wed, 11 Oct 2023 05:21:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 75BA42BC01D for ; Wed, 11 Oct 2023 05:21:23 +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 A6A03335C5D for ; Wed, 11 Oct 2023 05:21:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4A2E10D2 for ; Wed, 11 Oct 2023 05:21:20 +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: <1697001661.5fb454ae567ba6c7c71616b602ce641b5ab7f216.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-3.2.0.ebuild X-VCS-Directories: dev-libs/botan/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5fb454ae567ba6c7c71616b602ce641b5ab7f216 X-VCS-Branch: master Date: Wed, 11 Oct 2023 05:21:20 +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: fc555c8c-2a9e-4b4f-9abf-0b44a64733d4 X-Archives-Hash: 86be1eb1f85c219fd9a1106c61e9df7e commit: 5fb454ae567ba6c7c71616b602ce641b5ab7f216 Author: Sam James gentoo org> AuthorDate: Wed Oct 11 02:22:34 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 11 05:21:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb454ae dev-libs/botan: build using make again for now (to fix arm64 build) Bug: https://github.com/randombit/botan/issues/3750 Closes: https://bugs.gentoo.org/915544 Signed-off-by: Sam James gentoo.org> dev-libs/botan/botan-3.2.0.ebuild | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dev-libs/botan/botan-3.2.0.ebuild b/dev-libs/botan/botan-3.2.0.ebuild index 82a09259f817..bb651261749f 100644 --- a/dev-libs/botan/botan-3.2.0.ebuild +++ b/dev-libs/botan/botan-3.2.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc -inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig +inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig MY_P="Botan-${PV}" DESCRIPTION="C++ crypto library" @@ -46,7 +46,6 @@ RDEPEND=" " BDEPEND=" ${PYTHON_DEPS} - ${NINJA_DEPEND} $(python_gen_any_dep ' doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) ') @@ -151,7 +150,8 @@ src_configure() { $(use_with sqlite sqlite3) $(use_with zlib) - --build-tool=ninja + # Broken in 3.2.0, bug #915544 + #--build-tool=ninja --cpu=${chostarch} --docdir=share/doc --disable-modules=$(IFS=","; echo "${disable_modules[*]}") @@ -203,16 +203,12 @@ src_configure() { edo ${EPYTHON} configure.py --verbose "${myargs[@]}" } -src_compile() { - eninja -} - src_test() { LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" } src_install() { - DESTDIR="${D}" eninja install + default if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then # --docdir in configure controls the parent directory unfortunately