From patchwork Sat Aug 3 02:23:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 66622 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 9BC6A27BBEA; Sat, 3 Aug 2024 03:25:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 D982D27BBE2 for ; Sat, 3 Aug 2024 03:25:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sa4Rq-0002jc-UC; Fri, 02 Aug 2024 22:24:47 -0400 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 1sa4Rn-0002jK-Qd for guix-patches@gnu.org; Fri, 02 Aug 2024 22:24:44 -0400 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 1sa4Rn-0005pF-HV for guix-patches@gnu.org; Fri, 02 Aug 2024 22:24:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=uDuV/i6sxBcWQlJJo8cac1wtIzK8YyzOSWSyimDs2cE=; b=HIEKhdJMgP43XWFmPQKZu/s+/wwncoJ8ruOZRRmoGdjM7PABES/kpdS15pYpVWXm+D07FcsSgl3AHbiRf6OXi0Nkt8T2c3sD9tOvxWPuvLdr1Q1eww4jETuj0XY2KH/RZ5qs5exdGvmjZIsK8vN4uWUdpGUYitmN/o0+gbnPqxx9MJ5yfWc3yR3g2CvkGAf5i3sRpDIHWoMCBPLSdUdLoGClGqTNKfRJrZxzULGdpnp2MIpiJDNy6m1xm/wCD8WPPwejoDuVTnZ3wr2NFUhwOB18PNU0oV/hBZCoqIjFd7/qSdP5mygPTf4YY0uMQE5CvI4k2mDDKPo0ftWYnz7PKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sa4S6-0004Xd-9H for guix-patches@gnu.org; Fri, 02 Aug 2024 22:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72435] [PATCH] gnu: vulkan-loader: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Aug 2024 02:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72435@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172265188217413 (code B ref -1); Sat, 03 Aug 2024 02:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2024 02:24:42 +0000 Received: from localhost ([127.0.0.1]:53922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sa4Rm-0004Wn-7S for submit@debbugs.gnu.org; Fri, 02 Aug 2024 22:24:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:35934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sa4Rj-0004Wd-5D for submit@debbugs.gnu.org; Fri, 02 Aug 2024 22:24:40 -0400 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 1sa4RP-0002iW-Pe for guix-patches@gnu.org; Fri, 02 Aug 2024 22:24:19 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84] 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 1sa4RN-0005nJ-4O for guix-patches@gnu.org; Fri, 02 Aug 2024 22:24:19 -0400 Received: from m.tailaa68d.ts.net (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowABXXzO9lK1mGHcZAw--.13871S2; Sat, 03 Aug 2024 10:24:02 +0800 (CST) From: Zheng Junjie Date: Sat, 3 Aug 2024 10:23:54 +0800 Message-ID: <172a868a23c4b90b46b56a5de8dff2a5dbc1df25.1722651834.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-CM-TRANSID: zQCowABXXzO9lK1mGHcZAw--.13871S2 X-Coremail-Antispam: 1UD129KBjvJXoW7tF1kZFW5WrWkJFy5ZrWxCrg_yoW8GF1DpF WfCw4Ikwn3J3sayws0yF4j9rs0q34kGF4UXa47Aa1Fyw409r92yrWakr4rtF17Xry7Wa17 WayfWF45JFyrJaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUy2b7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I 3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxV WUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAF wI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcI k0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j 6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jY6wZUUUUU= X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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>: When cross-compilation, set the PKG_CONFIG_EXECUTABLE variable. Change-Id: Ie0466a64effa5c93f859ff872423f2403f23f5cb --- gnu/packages/vulkan.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: b20956651a53a8f23828fdeb6945e1a31e6997a8 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 25542c1e06..8aee673653 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata ;;; Copyright © 2022, 2024 dan -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -297,7 +297,11 @@ (define-public vulkan-loader (search-input-directory %build-inputs "include/vulkan")))) #$@(if (%current-target-system) - #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") + #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF" + (string-append "-DPKG_CONFIG_EXECUTABLE=" + (search-input-file + %build-inputs + (string-append "bin/" #$(pkg-config-for-target))))) #~("-DBUILD_TESTS=ON"))) #:phases #~(modify-phases %standard-phases