commit: 63d1d4468be28ca0cfa89a86548c9eed84cb33bd Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Aug 27 02:37:45 2023 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sun Aug 27 10:18:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d1d446
dev-libs/json-c: update 9999 * Use cmake generated doc target. * Don't hardcode amd64 location. * Inherit multibuild to silence IndirectInherit. * Syncronize with 0.17 ebuild where applicable. Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32469 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-libs/json-c/json-c-9999.ebuild | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild index d1cd5a7aa95a..57cba100cf9c 100644 --- a/dev-libs/json-c/json-c-9999.ebuild +++ b/dev-libs/json-c/json-c-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib git-r3 +inherit cmake-multilib git-r3 multibuild DESCRIPTION="A JSON implementation in C" HOMEPAGE="https://github.com/json-c/json-c/wiki"; @@ -21,11 +21,14 @@ MULTILIB_WRAPPED_HEADERS=( multilib_src_configure() { local mycmakeargs=( - -DDISABLE_WERROR=ON + # apps are not installed, so disable unconditionally. + # https://github.com/json-c/json-c/blob/json-c-0.17-20230812/apps/CMakeLists.txt#L119...L121 + -DBUILD_APPS=OFF + -DBUILD_STATIC_LIBS=$(usex static-libs) -DDISABLE_EXTRA_LIBS=ON - -DENABLE_THREADING=$(usex threads) + -DDISABLE_WERROR=ON -DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand) - -DBUILD_STATIC_LIBS=$(usex static-libs) + -DENABLE_THREADING=$(usex threads) ) cmake_src_configure @@ -33,14 +36,18 @@ multilib_src_configure() { multilib_src_compile() { cmake_src_compile - use doc && doxygen doc/Doxyfile + if use doc && multilib_is_native_abi; then + cmake_build doc + fi } multilib_src_test() { multilib_is_native_abi && cmake_src_test } -multilib_src_install_all() { - use doc && HTML_DOCS=( "${BUILD_DIR}-abi_x86_64.amd64"/doc/html/. ) - einstalldocs +multilib_src_install() { + if multilib_is_native_abi; then + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + einstalldocs + fi }
