summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-10-11 03:22:34 +0100
committerSam James <sam@gentoo.org>2023-10-11 06:21:01 +0100
commit5fb454ae567ba6c7c71616b602ce641b5ab7f216 (patch)
treee87d7e0fd7319b93c4b10f8765f18a18bfd4f240 /dev-libs/botan
parentprofiles/arch/arm64: unmask dev-libs/botan[cpu_flags_arm_neon] (diff)
downloadgentoo-5fb454ae567ba6c7c71616b602ce641b5ab7f216.tar.gz
gentoo-5fb454ae567ba6c7c71616b602ce641b5ab7f216.tar.bz2
gentoo-5fb454ae567ba6c7c71616b602ce641b5ab7f216.zip
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 <sam@gentoo.org>
Diffstat (limited to 'dev-libs/botan')
-rw-r--r--dev-libs/botan/botan-3.2.0.ebuild12
1 files 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