From patchwork Sat Dec 30 05:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58194 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 EBADC27BBEA; Sat, 30 Dec 2023 05:34:16 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 B69C427BBE2 for ; Sat, 30 Dec 2023 05:34:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJRz2-0004gS-Hg; Sat, 30 Dec 2023 00:34:04 -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 1rJRyz-0004g0-Sk for guix-patches@gnu.org; Sat, 30 Dec 2023 00:34:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJRyz-0001As-JS for guix-patches@gnu.org; Sat, 30 Dec 2023 00:34:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJRyz-000478-SJ for guix-patches@gnu.org; Sat, 30 Dec 2023 00:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68134] [PATCH] gnu: vulkan-loader: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 05:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68134@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170391438915751 (code B ref -1); Sat, 30 Dec 2023 05:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2023 05:33:09 +0000 Received: from localhost ([127.0.0.1]:42829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJRy9-00045z-DL for submit@debbugs.gnu.org; Sat, 30 Dec 2023 00:33:09 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJRy6-00045T-DX for submit@debbugs.gnu.org; Sat, 30 Dec 2023 00:33:08 -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 1rJRxz-0004Rg-UX for guix-patches@gnu.org; Sat, 30 Dec 2023 00:32:59 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rJRxx-00013B-55 for guix-patches@gnu.org; Sat, 30 Dec 2023 00:32:59 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowADn7Lxzqo9loLk7Ag--.34339S2; Sat, 30 Dec 2023 13:28:20 +0800 (CST) From: Zheng Junjie Date: Sat, 30 Dec 2023 13:31:36 +0800 Message-ID: <0350fcf40aca2aea3e7eabfd11f6a8ab8c1f7a0f.1703914296.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: qwCowADn7Lxzqo9loLk7Ag--.34339S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYS7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Cr 0_Gr1UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvE ncxIr21le4C262xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I 8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AK xVWUJVWUGwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcV AFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8I cIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r 1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jeXdbUUUUU= X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/vulkan.scm(vulkan-loader): [arguments]<#:configure-flags>: When cross-compiling, set -DBUILD_TESTS=OFF and -DUSE_GAS=OFF. [inputs]: Add libxrandr. Change-Id: I580e1c77c4b9b5a3483e93ff9eda78fbe07ec292 --- gnu/packages/vulkan.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: f76ca2b0e894c244d5011a32b30dee8fd874e322 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ca771a30b1..285d6be7f5 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata ;;; Copyright © 2022 dan +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -270,7 +271,9 @@ (define-public vulkan-loader (dirname (dirname (search-input-directory %build-inputs "include/vulkan")))) - "-DBUILD_TESTS=ON") + #$@(if (%current-target-system) + #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") + #~("-DBUILD_TESTS=ON"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-pkg-config-file @@ -299,7 +302,7 @@ (define-public vulkan-loader python wayland)) (inputs - (list vulkan-headers)) + (list vulkan-headers libxrandr)) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan")