[gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/

[Sam James]

commit:     b07ac55e3e8f54c10ebf7cec3e6db6744a5687e8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 08:51:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 10:02:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07ac55e

dev-libs/botan: backport sanitizer support to 2.19.x

Backport e05b37859baea238fd59b9a686b5891b76346686.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/botan/Manifest               |  2 --
 dev-libs/botan/botan-2.19.3-r2.ebuild | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index bb8e67b48fc7..e4e733e8a5fa 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -4,5 +4,3 @@ DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B 
c31365e6bd4106f96a033e5f092c528c0185577f
 DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B 
9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744
 SHA512 
f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9
 DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B 
f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b510ea8ad19a5286d46d3a8e37e13746d2d4751eb16a70fdc8371b4435b030ef0a17f1ab6dcd76bd81bb3a4fa
 SHA512 
526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9
 DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B 
f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6
 SHA512 
3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756
-DIST Botan-3.3.0.tar.xz 7164024 BLAKE2B 
051a24c28e6858fdff2af15d01a871ebe5bab11d773be821c0a56a55c725c91cf3119280195ac736f4df83305c1d4910430e6b26deded0d4c634e5c2fc23b389
 SHA512 
90930add225a2b4376046b3ed0177c71e7d19e983fb2b99c40751de5e6c3959b520eaa1e836782eb02ebc8aff8e9a4fd928f585de5e6b1798a8ad4aa0464f19b
-DIST Botan-3.3.0.tar.xz.asc 488 BLAKE2B 
043538ff2572a449d4d9ad4bba6d7cab78865e924f712d1b4d4aad9f378cc417f07c19a25adefa22b6e1c06259a50880414c11ce8d3ad1e7f815cf458dbbe6b8
 SHA512 
c951079c22665966b96cf18c20df7b709353b42dab4aeb33d021b4a8abbc0f06d8fe909f1a5db3e736b4f93b17374d8f832f7aa9f25757a5d5ab1604320581b2

diff --git a/dev-libs/botan/botan-2.19.3-r2.ebuild 
b/dev-libs/botan/botan-2.19.3-r2.ebuild
index fbab36fb5bef..2a151dbc3529 100644
--- a/dev-libs/botan/botan-2.19.3-r2.ebuild
+++ b/dev-libs/botan/botan-2.19.3-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc
-inherit edo multiprocessing 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"
@@ -169,6 +169,18 @@ src_configure() {
 
        tc-export AR CC CXX
 
+       local sanitizers=()
+       if is-flagq -fsanitize=address ; then
+               sanitizers+=( address )
+       fi
+       if is-flagq -fsanitize=undefined ; then
+               sanitizers+=( undefined )
+       fi
+       filter-flags '-fsanitize=*'
+       myargs+=(
+               --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}")
+       )
+
        edo ${EPYTHON} configure.py --verbose "${myargs[@]}"
 }