Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 711390 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +6 lines)
Line  Link Here
0
-- a/dev-libs/check/check-0.14.0-r1.ebuild
0
++ b/dev-libs/check/check-0.14.0-r1.ebuild
Lines 27-33 PATCHES=( "${FILESDIR}/check-0.14.0-r1-disable-automagic-dep.patch" ) Link Here
27
multilib_src_configure() {
27
multilib_src_configure() {
28
	local mycmakeargs=(
28
	local mycmakeargs=(
29
		-DBUILD_TESTING=$(usex test ON OFF)
29
		-DBUILD_TESTING=$(usex test ON OFF)
30
		-DCHECK_ENABLE_SUBUNIT=$(usex subunit 1 0)
30
		-DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF)
31
	)
31
	)
32
32
33
	cmake_src_configure
33
	cmake_src_configure
34
-- a/dev-libs/check/files/check-0.14.0-r1-disable-automagic-dep.patch
34
++ b/dev-libs/check/files/check-0.14.0-r1-disable-automagic-dep.patch
Lines 7-23 Link Here
7
-check_library_exists(subunit subunit_test_start "" HAVE_SUBUNIT)
7
-check_library_exists(subunit subunit_test_start "" HAVE_SUBUNIT)
8
-if (HAVE_SUBUNIT)
8
-if (HAVE_SUBUNIT)
9
+option(CHECK_ENABLE_SUBUNIT "Enable subunit support" ON)
9
+option(CHECK_ENABLE_SUBUNIT "Enable subunit support" ON)
10
+if (CHECK_ENABLE_SUBUNIT EQUAL 1)
10
+if (CHECK_ENABLE_SUBUNIT)
11
   set(SUBUNIT "subunit")
11
   set(SUBUNIT "subunit")
12
   set(ENABLE_SUBUNIT 1)
12
   set(ENABLE_SUBUNIT 1)
13
+  set(HAVE_SUBUNIT 1)
13
+  set(HAVE_SUBUNIT 1)
14
   add_definitions(-DENABLE_SUBUNIT=1)
14
   add_definitions(-DENABLE_SUBUNIT=1)
15
-else(HAVE_SUBUNIT)
15
-else(HAVE_SUBUNIT)
16
+else(CHECK_ENABLE_SUBUNIT EQUAL 1)
16
+else(CHECK_ENABLE_SUBUNIT)
17
   set(ENABLE_SUBUNIT 0)
17
   set(ENABLE_SUBUNIT 0)
18
   add_definitions(-DENABLE_SUBUNIT=0)
18
   add_definitions(-DENABLE_SUBUNIT=0)
19
-endif (HAVE_SUBUNIT)
19
-endif (HAVE_SUBUNIT)
20
+endif (CHECK_ENABLE_SUBUNIT EQUAL 1)
20
+endif (CHECK_ENABLE_SUBUNIT)
21
21
22
 ###############################################################################
22
 ###############################################################################
23
 # Generate "config.h" from "cmake/config.h.in"
23
 # Generate "config.h" from "cmake/config.h.in"

Return to bug 711390