From patchwork Wed Jan 10 12:19:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58765 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 C781E27BBEA; Wed, 10 Jan 2024 12:25:29 +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,URIBL_BLOCKED autolearn=unavailable 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 4FB8627BBE2 for ; Wed, 10 Jan 2024 12:25:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNXdi-0003o7-0e; Wed, 10 Jan 2024 07:24:58 -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 1rNXde-0003nj-GB for guix-patches@gnu.org; Wed, 10 Jan 2024 07:24:54 -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 1rNXde-0007TG-7l for guix-patches@gnu.org; Wed, 10 Jan 2024 07:24:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNXdl-0006yx-KR for guix-patches@gnu.org; Wed, 10 Jan 2024 07:25:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68133] [PATCH] gnu: mesa: Fix cross-compiling again. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 12:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 68133@debbugs.gnu.org, efraim@flashner.co.il X-Debbugs-Original-Cc: guix-patches@gnu.org, Efraim Flashner , 68133@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170488947926806 (code B ref -1); Wed, 10 Jan 2024 12:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2024 12:24:39 +0000 Received: from localhost ([127.0.0.1]:42439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNXdP-0006yI-3W for submit@debbugs.gnu.org; Wed, 10 Jan 2024 07:24:39 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNXdM-0006xo-U0 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 07:24:37 -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 1rNXdA-0003je-4e for guix-patches@gnu.org; Wed, 10 Jan 2024 07:24:24 -0500 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 1rNXd6-0006xR-I6; Wed, 10 Jan 2024 07:24:23 -0500 Received: from m (unknown [183.247.5.182]) by APP-05 (Coremail) with SMTP id zQCowAA3FwxkjJ5lPMgnBQ--.15986S2; Wed, 10 Jan 2024 20:24:05 +0800 (CST) References: <59dfe1d44bc0ea2cc713da3273c2e49b47e470cf.1703912009.git.zhengjunjie@iscas.ac.cn> <87jzoqze6q.fsf@gnu.org> <87o7e1mf7f.fsf@iscas.ac.cn> <87edeqdf2m.fsf@gnu.org> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Z572 Date: Wed, 10 Jan 2024 20:19:09 +0800 In-reply-to: <87edeqdf2m.fsf@gnu.org> Message-ID: <871qape5qz.fsf@iscas.ac.cn> MIME-Version: 1.0 X-CM-TRANSID: zQCowAA3FwxkjJ5lPMgnBQ--.15986S2 X-Coremail-Antispam: 1UD129KBjvdXoW7XryfKw43ZrykWF4rtF4DCFg_yoWfJrbEgF 4DC39Ykws5KFZ7G3Z2vF4rursrWa1jyr1fAF17tFnxtrn3ZrsrWas293ZFv3W5Kw4q9F48 taykXw1rArW2vjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbzAYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z2 80aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487M2AExVA0xI801c8C 04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z2 80aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI 7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxV Cjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY 6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6x AIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY 1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUgg_TUUUUU X-Originating-IP: [183.247.5.182] 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, 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 Mathieu Othacehe writes: > Hello, > >> * gnu/packages/gl.scm(mesa)[native-inputs]: when cross-compile, add >> cmake-minimal-cross. >> [arguments]: adjust fix-cross-compiling to find llvm. >> >> * gnu/packages/llvm.scm(llvm-for-mesa) >> [arguments]<#:configure-flags>: When cross-compile, set >> -DBUILD_SHARED_LIBS:BOOL=TRUE and -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE, >> remove -DLLVM_LINK_LLVM_DYLIB.* . >> <#:phases>: when cross-compile, remove delete-static-libraries phase. > > I amended the commit message and applied, > > Thanks, > > Mathieu after mesa-updates merge, mesa's meson.build use config-tool method to find llvm, so cross compile break again, this patch fix it. ``` meson.build 1712| method : host_machine.system() == 'windows' ? 'auto' : 'config-tool', ``` From c7b0f3a8f4886da8a3b120758409abf3777a82f8 Mon Sep 17 00:00:00 2001 Message-ID: From: Zheng Junjie Date: Wed, 10 Jan 2024 20:14:32 +0800 Subject: [PATCH] gnu: mesa: fix cross-compiling again. * gnu/packages/gl.scm(mesa)[arguments]<#:phases>: when cross compiling, force use cmake method to find llvm. Change-Id: I27f6f4d9d71028c15588eeade48d3a918c042b9c --- gnu/packages/gl.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7998142b4d..49dc878c02 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -421,6 +421,9 @@ (define-public mesa ;; When cross compiling, we use cmake to find llvm, not ;; llvm-config, because llvm-config cannot be executed ;; see https://github.com/llvm/llvm-project/issues/58984 + (substitute* "meson.build" + (("method : host_machine\\.system.*") + "method : 'cmake',\n")) (setenv "CMAKE" (search-input-file native-inputs "/bin/cmake"))))) base-commit: e541f9593f8bfc84b6140c2408b393243289fae6 -- 2.41.0