From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC97115800A for ; Sun, 27 Aug 2023 10:21:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F14572BC0CA; Sun, 27 Aug 2023 10:21:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D525B2BC0CA for ; Sun, 27 Aug 2023 10:21:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6166340DDF for ; Sun, 27 Aug 2023 10:21:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20F211093 for ; Sun, 27 Aug 2023 10:21:22 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1693131532.63d1d4468be28ca0cfa89a86548c9eed84cb33bd.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/json-c/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/json-c/json-c-9999.ebuild X-VCS-Directories: dev-libs/json-c/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 63d1d4468be28ca0cfa89a86548c9eed84cb33bd X-VCS-Branch: master Date: Sun, 27 Aug 2023 10:21:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6a6e74d4-f520-4df4-b5df-8e175050f970 X-Archives-Hash: e244f4a7b265fa3d943cf5f83316f369 commit: 63d1d4468be28ca0cfa89a86548c9eed84cb33bd Author: Alfred Wingate protonmail com> AuthorDate: Sun Aug 27 02:37:45 2023 +0000 Commit: Jakov Smolić gentoo 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 protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/32469 Signed-off-by: Jakov Smolić 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 }