From patchwork Sun Nov 13 05:37:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 44490 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2CDC227BBEA; Sun, 13 Nov 2022 05:38:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E709E27BBEB for ; Sun, 13 Nov 2022 05:38:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ou5h6-0002TA-By; Sun, 13 Nov 2022 00:38:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ou5gx-0002RQ-Qe for guix-patches@gnu.org; Sun, 13 Nov 2022 00:38:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ou5gx-0002Bw-FB for guix-patches@gnu.org; Sun, 13 Nov 2022 00:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ou5gx-0004AY-AY for guix-patches@gnu.org; Sun, 13 Nov 2022 00:38:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59238] [PATCH 3/4] gnu: qttools: Add clang-15 as input. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Nov 2022 05:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59238@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 59238-submit@debbugs.gnu.org id=B59238.166831784615959 (code B ref 59238); Sun, 13 Nov 2022 05:38:03 +0000 Received: (at 59238) by debbugs.gnu.org; 13 Nov 2022 05:37:26 +0000 Received: from localhost ([127.0.0.1]:49842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou5gM-00049D-13 for submit@debbugs.gnu.org; Sun, 13 Nov 2022 00:37:26 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:44726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou5gJ-00048g-UE for 59238@debbugs.gnu.org; Sun, 13 Nov 2022 00:37:24 -0500 Received: by mail-qt1-f169.google.com with SMTP id l2so5182435qtq.11 for <59238@debbugs.gnu.org>; Sat, 12 Nov 2022 21:37:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pd8e1OhllLJlqqGK698dm2Y1fmRcJ/DEz3I5qGoKunI=; b=UwKhfhm60jBpwDCpXMsjfTJTmwyMM93U8WIKac9isNJgIl4GSIqkACWHFLqHRsMugh NNYdEyHIouRXX4gP3bdeUZcYj4CUPyLj+Gylrke3eKm8DPmGL8KGoco/Ssr2RuDA2vLL W8yvzGWdf8dKCiT3nLzOTxjudL3F3qakZcB429Mphs8bCaszBWA9dy8e7mQPq252ittN 8i6NxNX+NovT2IA0LmOfGvA5Dg7D+ud3UV8lKOQ2XMSdUKdNDZx4bm0n81i7HYFqbG7C 9t55xe5nXqW4BMW4J8u6FXZ3pOx3yH6WO8Bp/bFSiJWda90DXM2vY3AT3TL+LjWbv+4N z0ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pd8e1OhllLJlqqGK698dm2Y1fmRcJ/DEz3I5qGoKunI=; b=bIt1/rji3WAINUGY1qXouMuOlA8dDD0dSFw8iUE12JiT7DuuaVJXpba5uArr/cvQlN wJerevmNDlejZXZEVKQ8y6Ja9tuCgAvun1i0fslOu4sa90S2d5e8HCRRTCwRnuPTUGzq CR19FeUsOxK0NCf39ztXq1Cm/bgFDqZs0JiAxKeWKj9tnVQXdGadwjplSKm4jA6jsswM A92i5IsjCE3B4FV4489sxW5NHwxdDo5WfO+TByQc8u876LZmeTi6wZeQttqIAXanMwGd JZPdUi4C4hxlwnNsZEZJpceR/iQDpzYd9h49d9GBW1G8Sdl620dGWuvig/SVmF7yzkQF tw0g== X-Gm-Message-State: ANoB5pmB01oNqFfgr/Y9lM8UA4Gb+EMcnjUp91R37n4iJL3Z8ctlLyoO a4cYYJIEIKixCGCq7M/mb88vEK3WgpU= X-Google-Smtp-Source: AA0mqf7YNWkJzTeI/I73XIdute6XlzgA06Z1h1zjNvH3ja5zv19l3ZzsZTHpygsj8lZk8cr+bfdr5g== X-Received: by 2002:ac8:48d6:0:b0:35b:b0a4:a6f9 with SMTP id l22-20020ac848d6000000b0035bb0a4a6f9mr7662246qtr.559.1668317838369; Sat, 12 Nov 2022 21:37:18 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id bk40-20020a05620a1a2800b006fa4b111c76sm4295766qkb.36.2022.11.12.21.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 21:37:18 -0800 (PST) From: Maxim Cournoyer Date: Sun, 13 Nov 2022 00:37:08 -0500 Message-Id: <20221113053709.30530-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221113053709.30530-1-maxim.cournoyer@gmail.com> References: <20221113053709.30530-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qttools) [inputs]: Add clang-15, so that the qdoc command can be built. [phases] {sanity-check}: New phase, to guard against a problem that proved difficult to isolate. --- gnu/packages/qt.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 408fe35d0a..7ae02e2a63 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1802,9 +1802,22 @@ (define-public qttools (list ;; The build system attempts to fetch online resources and fails when ;; building the test suite. - #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF"))) + #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'sanity-check + (lambda* (#:key outputs #:allow-other-keys) + ;; This validation exists to validate that the dynamic + ;; library for Clang works as intended; there was + ;; originally problems due to left-overs patching the + ;; value of BUILD_SHARED_LIBS in CLANG-FROM-LLVM that + ;; would cause the following error: "CommandLine Error: + ;; Option 'filter' registered more than once!" + (invoke/quiet (search-input-file outputs "bin/qdoc") + "--help")))))) (native-inputs (list perl qtdeclarative vulkan-headers)) - (inputs (list libxkbcommon mesa qtbase)) + ;; Use clang-15, which is built using as a single shared library, which is + ;; what the build system of qttools expects. + (inputs (list clang-15 libxkbcommon mesa qtbase)) (home-page (package-home-page qtbase)) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse