Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/json-c/
Date: Sat, 08 Aug 2020 09:04:39
Message-Id: 1596877444.6313bdad058b1afedd73ce8cf137eb4876c43fb0.juippis@gentoo
1 commit: 6313bdad058b1afedd73ce8cf137eb4876c43fb0
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Mon Jul 27 07:58:40 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 8 09:04:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6313bdad
7
8 dev-libs/json-c: update live ebuild
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.23
11 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
12 Closes: https://github.com/gentoo/gentoo/pull/16848
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 dev-libs/json-c/json-c-9999.ebuild | 6 ++++--
16 1 file changed, 4 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
19 index b39b8ba779c..effac5b4d6c 100644
20 --- a/dev-libs/json-c/json-c-9999.ebuild
21 +++ b/dev-libs/json-c/json-c-9999.ebuild
22 @@ -14,6 +14,8 @@ LICENSE="MIT"
23 SLOT="0/5"
24 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
25
26 +BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
27 +
28 MULTILIB_WRAPPED_HEADERS=(
29 /usr/include/json-c/config.h
30 )
31 @@ -24,7 +26,6 @@ src_prepare() {
32
33 multilib_src_configure() {
34 local mycmakeargs=(
35 - -DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
36 -DDISABLE_WERROR=ON
37 -DENABLE_THREADING=$(usex threads)
38 -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
39 @@ -36,6 +37,7 @@ multilib_src_configure() {
40
41 multilib_src_compile() {
42 cmake_src_compile
43 + use doc && doxygen doc/Doxyfile
44 }
45
46 multilib_src_test() {
47 @@ -43,6 +45,6 @@ multilib_src_test() {
48 }
49
50 multilib_src_install_all() {
51 - use doc && HTML_DOCS=( "${S}"/doc/html/. )
52 + use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. )
53 einstalldocs
54 }