GNU bug report logs - #49717
[PATCH] gnu: mesa-opencl-icd: Use absolute path for the library.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#49717: closed ([PATCH] gnu: mesa-opencl-icd: Use absolute
 path for the library.)
Date: Tue, 27 Jul 2021 16:41:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Tue, 27 Jul 2021 16:40:26 +0000
with message-id <87wnpbww05.fsf <at> kitej>
and subject line Re: [bug#49717] [PATCH] gnu: mesa-opencl-icd: Use absolute path for the library.
has caused the debbugs.gnu.org bug report #49717,
regarding [PATCH] gnu: mesa-opencl-icd: Use absolute path for the library.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
49717: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49717
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Ivan Gankevich <i.gankevich <at> spbu.ru>
To: guix-patches <at> gnu.org
Cc: Ivan Gankevich <i.gankevich <at> spbu.ru>
Subject: [PATCH] gnu: mesa-opencl-icd: Use absolute path for the library.
Date: Sat, 24 Jul 2021 13:01:28 +0300

* gnu/packages/gl.scm (mesa-opencl-icd): Use absolute path for OpenCL
  platform library in "mesa.icd" file.  With this patch setting
  LD_LIBRARY_PATH=$LIBRARY_PATH is no longer needed to run OpenCL
  applications.
---
 gnu/packages/gl.scm | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index c14e7c0d53..f693efb36b 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -475,10 +475,26 @@ from software emulation to complete hardware acceleration for modern GPUs.")
   (package/inherit mesa-opencl
     (name "mesa-opencl-icd")
     (arguments
-     (substitute-keyword-arguments (package-arguments mesa)
-       ((#:configure-flags flags)
-        `(cons "-Dgallium-opencl=icd"
-               ,(delete "-Dgallium-opencl=standalone" flags)))))))
+      (substitute-keyword-arguments (package-arguments mesa)
+        ((#:configure-flags flags)
+         `(cons "-Dgallium-opencl=icd"
+                ,(delete "-Dgallium-opencl=standalone" flags)))
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-after 'install 'mesa-icd-absolute-path
+              (lambda _
+                ;; Use absolute path for OpenCL platform library.
+                ;; Otherwise we would have to set LD_LIBRARY_PATH=LIBRARY_PATH
+                ;; for ICD in our applications to find OpenCL platform.
+                (use-modules (guix build utils)
+                             (ice-9 textual-ports))
+                (let* ((out (assoc-ref %outputs "out"))
+                       (mesa-icd (string-append out "/etc/OpenCL/vendors/mesa.icd"))
+                       (old-path (call-with-input-file mesa-icd get-string-all))
+                       (new-path (string-append out "/lib/" (string-trim-both old-path))))
+                  (if (file-exists? new-path)
+                    (call-with-output-file mesa-icd
+                      (lambda (port) (format port "~a\n" new-path)))))))))))))
 
 (define-public mesa-headers
   (package/inherit mesa
-- 
2.32.0

[Message part 3 (message/rfc822, inline)]

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Ivan Gankevich <i.gankevich <at> spbu.ru>
Cc: 49717-done <at> debbugs.gnu.org
Subject: Re: [bug#49717] [PATCH] gnu: mesa-opencl-icd: Use absolute path for
 the library.
Date: Tue, 27 Jul 2021 16:40:26 +0000

[Message part 4 (text/plain, inline)]

I added a copyright line and pushed the patch as
8cfd9ef831caff790c837eca87b1164801459108.
Thanks.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.