From patchwork Sun Jun 2 01:19:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nathan X-Patchwork-Id: 65123 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 AF9C227BBEA; Sun, 2 Jun 2024 02:20:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 8DD6C27BBE2 for ; Sun, 2 Jun 2024 02:20:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDZt3-0000Jn-CB; Sat, 01 Jun 2024 21:19:53 -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 1sDZt0-0000J7-Oj for guix-patches@gnu.org; Sat, 01 Jun 2024 21:19:50 -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 1sDZt0-00040P-E6 for guix-patches@gnu.org; Sat, 01 Jun 2024 21:19:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDZtB-0006ct-Qe for guix-patches@gnu.org; Sat, 01 Jun 2024 21:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71109] [PATCH] gnu: vulkan-tools: Wrap binaries with LD_LIBRARY_PATH. References: <0f2a806ee6259147a098e8d672d03ed768fde5fa.1716370579.git.sughosha@disroot.org> In-Reply-To: <0f2a806ee6259147a098e8d672d03ed768fde5fa.1716370579.git.sughosha@disroot.org> Resent-From: nathan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Jun 2024 01:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71109 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: sughosha@disroot.org, 71109@debbugs.gnu.org Received: via spool by 71109-submit@debbugs.gnu.org id=B71109.171729117125424 (code B ref 71109); Sun, 02 Jun 2024 01:20:01 +0000 Received: (at 71109) by debbugs.gnu.org; 2 Jun 2024 01:19:31 +0000 Received: from localhost ([127.0.0.1]:57577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDZsg-0006c0-GN for submit@debbugs.gnu.org; Sat, 01 Jun 2024 21:19:30 -0400 Received: from mail.nborghese.com ([207.148.28.48]:53472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDZse-0006bq-3E for 71109@debbugs.gnu.org; Sat, 01 Jun 2024 21:19:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=062122; bh=dXOpxWblXd7l6 H498gCJG3n9clCgnzJ7GXxc4uCiCHw=; h=to:from:subject:date; d=nborghese.com; b=ZCVGZGNGQUx0WY0bkExW2zBJ6twViybATAug3tudg1RKBHZiA0h OYWl/Olntnjj0ksWpOMaa/iz4S31ZJQ8qQYSMkU0vgDk2q5K/mO/HHDtuwrDBnLuJIj6JC EKbQmRBxRK20rbYNVFklMBLZQRCZR6ursD6pq9867OHnLvwwJo= Received: by nborghese.com (OpenSMTPD) with ESMTPSA id 99d3bbf3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 2 Jun 2024 01:19:03 +0000 (UTC) Message-ID: <66f9f6e2-434b-08e7-b5d5-c9d1cfd99b50@nborghese.com> Date: Sun, 2 Jun 2024 01:19:14 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US 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: , Reply-to: nathan X-ACL-Warn: , nathan via Guix-patches X-Patchwork-Original-From: nathan via Guix-patches via From: nathan 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 commit e156996c478a8e5d040ccf199437bcdbdbab63ed in vulkan-tools makes it use volk to load vulkan instead of a bunch of custom code in the repo. volk uses dlopen("libvulkan.so.1"). i dont remember volk ever working, so this just propagated the bug to another program. attached is a patch to hard-code the libvulkan.so path into volk. vulkan-headers also has dlopen for libvulkan.so. i dont know which programs use it, but next time we have to rebuild everything we may as well patch it. i attached a patch that shows how to do it. From ee4581690b6486a65bf0e4faed3f2c88cac70d9e Mon Sep 17 00:00:00 2001 Message-ID: From: nathan Date: Sat, 1 Jun 2024 19:55:24 -0400 Subject: [PATCH] gnu: volk: Hard-code path of vulkan-loader for dynamic loading * gnu/packages/vulkan.scm (volk): [arguments]: use gexp. <#:phases>: patch dlopen with libvulkan.so. fixes vulkan-tools and potentially other programs too. [input]: add vulkan-loader Change-Id: I5ef0eb13d35e517b8947faddace641882a775b80 --- gnu/packages/vulkan.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 4c53a19aba..215a592266 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -568,9 +568,18 @@ (define-public volk "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;no test - #:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON"))) - (inputs (list vulkan-headers)) + (list + #:tests? #f ;no test + #:configure-flags #~(list "-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-loader-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "volk.c" + (("dlopen\\(\"libvulkan.so") + (string-append "dlopen(\"" (assoc-ref inputs "vulkan-loader") + "/lib/libvulkan.so")))))))) + (inputs (list vulkan-headers vulkan-loader)) (synopsis "Meta loader for Vulkan API") (description "Volk is a meta-loader for Vulkan. It allows you to dynamically load base-commit: fa7906d64881ee12e0c418136b44c73766e3d169 -- 2.45.1