From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/files/
Date: Tue, 29 Aug 2023 07:49:14 +0000 (UTC) [thread overview]
Message-ID: <1693295310.b5fac48036eaaf2af6b7b68d98d43860cc50b67d.conikost@gentoo> (raw)
commit: b5fac48036eaaf2af6b7b68d98d43860cc50b67d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Aug 28 19:45:44 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 07:48:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fac480
app-antivirus/clamav: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32497
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../clamav/files/clamav-1.0.1-select-python.patch | 44 ----------------------
1 file changed, 44 deletions(-)
diff --git a/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch b/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch
deleted file mode 100644
index 70bedc029399..000000000000
--- a/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch enables us to tell CMake to find a particular python
-impl on a multi-impl system.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,20 +223,26 @@ if(ENABLE_TESTS)
- find_package(Libcheck REQUIRED)
-
- # Used to generate the test files and for the application feature test framework
-- find_package(Python3 REQUIRED)
-+ # In distros that support multiple implementations of python it is helpful to specify the impl to use
-+ if(DEFINED PYTHON_FIND_VERSION)
-+ find_package(Python3 EXACT ${PYTHON_FIND_VERSION} REQUIRED)
-+ else()
-+ find_package(Python3 REQUIRED)
-+ # Not requesting a specific python impl; try using pytest from the PATH
-+ execute_process(
-+ COMMAND pytest --version
-+ RESULT_VARIABLE PYTEST_EXIT_CODE
-+ ERROR_QUIET OUTPUT_QUIET
-+ )
-
-- # First try using pytest from the PATH
-- execute_process(
-- COMMAND pytest --version
-- RESULT_VARIABLE PYTEST_EXIT_CODE
-- ERROR_QUIET OUTPUT_QUIET
-- )
-+ if(${PYTEST_EXIT_CODE} EQUAL 0)
-+ # pytest found in the path.
-+ set(PythonTest_COMMAND "pytest;-v")
-+ endif()
-+ endif()
-
-- if(${PYTEST_EXIT_CODE} EQUAL 0)
-- # pytest found in the path.
-- set(PythonTest_COMMAND "pytest;-v")
-- else()
-- # Not in the path, try using: python3 -m pytest
-+ if("${PythonTest_COMMAND}" STREQUAL "")
-+ # Not in the path or specified a python impl; try using: python3 -m pytest
- execute_process(
- COMMAND ${Python3_EXECUTABLE} -m pytest --version
- RESULT_VARIABLE PYTEST_MODULE_EXIT_CODE
next reply other threads:[~2023-08-29 7:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 7:49 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-23 6:05 [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/files/ Arthur Zamarin
2022-02-09 23:06 Conrad Kostecki
2021-10-16 15:52 Thomas Raschbacher
2021-10-05 23:58 Michael Orlitzky
2021-04-19 19:06 Michael Orlitzky
2020-09-23 3:34 Michael Orlitzky
2019-12-31 18:19 Aaron Bauman
2019-04-04 21:16 Aaron Bauman
2018-10-07 18:21 Thomas Raschbacher
2018-05-27 16:11 Aaron Bauman
2016-07-03 11:57 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1693295310.b5fac48036eaaf2af6b7b68d98d43860cc50b67d.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox