diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-17 17:55:54 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-17 18:05:43 +0200 |
| commit | 8610182f0000294719bb307d3a51443fbe06c089 (patch) | |
| tree | 0a0bdd64d38bd77ec999993082c8fb20bf7d3993 /kde-apps/libkdegames | |
| parent | sys-apps/haveged: version bump to 1.9.10 and 1.9.11 (diff) | |
| download | gentoo-8610182f0000294719bb307d3a51443fbe06c089.tar.gz gentoo-8610182f0000294719bb307d3a51443fbe06c089.tar.bz2 gentoo-8610182f0000294719bb307d3a51443fbe06c089.zip | |
kde-apps/libkdegames: Set ECM_TEST="forceoptional" and use patch
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/libkdegames')
| -rw-r--r-- | kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch | 28 | ||||
| -rw-r--r-- | kde-apps/libkdegames/libkdegames-20.04.2.ebuild | 4 |
2 files changed, 31 insertions, 1 deletions
diff --git a/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch b/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch new file mode 100644 index 000000000000..e7ffd23ade60 --- /dev/null +++ b/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch @@ -0,0 +1,28 @@ +From f80393453a5645c0e9a4bdb8a23c9b303b0c4d41 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 17 Jun 2020 17:51:36 +0200 +Subject: [PATCH] Also add BUILD_TESTING condition in subdir + +Follow-up to 02679f6d. +--- + libkdegamesprivate/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libkdegamesprivate/CMakeLists.txt b/libkdegamesprivate/CMakeLists.txt +index b122f37a..c2e9572e 100644 +--- a/libkdegamesprivate/CMakeLists.txt ++++ b/libkdegamesprivate/CMakeLists.txt +@@ -1,7 +1,9 @@ + enable_testing() + project(libkdegamesprivate) + +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + # NOTE: The libkdegamesprivate target is compiled in the parent directory, + # because CMake can't cope with exported libraries in two different +-- +2.27.0 + diff --git a/kde-apps/libkdegames/libkdegames-20.04.2.ebuild b/kde-apps/libkdegames/libkdegames-20.04.2.ebuild index a7832402aee9..fd783d7f2048 100644 --- a/kde-apps/libkdegames/libkdegames-20.04.2.ebuild +++ b/kde-apps/libkdegames/libkdegames-20.04.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ECM_TEST="forceoptional-recursive" +ECM_TEST="forceoptional" KFMIN=5.70.0 QTMIN=5.14.1 VIRTUALX_REQUIRED="test" @@ -49,3 +49,5 @@ DEPEND=" media-libs/openal " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-optional-tests.patch" ) |