[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/63: gnu: Mesa: Fix substitutions for absolute library references.
From: |
guix-commits |
Subject: |
53/63: gnu: Mesa: Fix substitutions for absolute library references. |
Date: |
Tue, 26 May 2020 17:18:14 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 5a746104e3c91400099377fcc4bd763b9e91fb96
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 22 19:51:01 2020 +0200
gnu: Mesa: Fix substitutions for absolute library references.
* gnu/packages/gl.scm (mesa)[arguments]: In the 'fix-dlopen-libnames' phase,
adjust substitutions so that they patch the correct files.
---
gnu/packages/gl.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index ad8f06b..788fe7c 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -357,16 +357,16 @@ also known as DXTn or DXTC) for Mesa.")
(("'u_format_test',") ""))
#t)))
'())
- (add-before
- 'configure 'fix-dlopen-libnames
+ (add-before 'configure 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Remain agnostic to .so.X.Y.Z versions while doing
;; the substitutions so we're future-safe.
- (substitute* "src/glx/dri_common.c"
- (("dlopen\\(\"libGL\\.so")
- (string-append "dlopen(\"" out "/lib/libGL.so")))
- (substitute* "src/egl/drivers/dri2/egl_dri2.c"
+ (substitute* "src/glx/meson.build"
+ (("-DGL_LIB_NAME=\"lib@0@\\.so\\.@1@\"")
+ (string-append "-DGL_LIB_NAME=\"" out
+ "/lib/lib@0@.so.@1@\"")))
+ (substitute* "src/gbm/backends/dri/gbm_dri.c"
(("\"libglapi\\.so")
(string-append "\"" out "/lib/libglapi.so")))
(substitute* "src/gbm/main/backend.c"
- 49/63: gnu: shaderc: Enable (some) tests., (continued)
- 49/63: gnu: shaderc: Enable (some) tests., guix-commits, 2020/05/26
- 26/63: gnu: python-idna: Update to 2.9., guix-commits, 2020/05/26
- 28/63: gnu: NSS: Update to 3.52., guix-commits, 2020/05/26
- 32/63: gnu: KDE Frameworks: Update to 5.70., guix-commits, 2020/05/26
- 35/63: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]., guix-commits, 2020/05/26
- 40/63: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/26
- 34/63: gnu: Mesa: Fix ineffective substitution on i686-linux., guix-commits, 2020/05/26
- 42/63: gnu: glslang: Update to 8.13.3743., guix-commits, 2020/05/26
- 44/63: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/26
- 48/63: gnu: shaderc: Update to 2020.0., guix-commits, 2020/05/26
- 53/63: gnu: Mesa: Fix substitutions for absolute library references.,
guix-commits <=
- 55/63: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/26
- 58/63: gnu: mtxclient: Update to 0.3.0., guix-commits, 2020/05/26
- 46/63: gnu: vulkan-loader: Enable tests., guix-commits, 2020/05/26
- 45/63: gnu: vulkan-loader: Update to 1.2.140., guix-commits, 2020/05/26
- 50/63: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/26
- 57/63: gnu: qtdeclarative: Fix reference on qmlcachegen., guix-commits, 2020/05/26
- 61/63: gnu: mesa-headers: Do not inherit outputs from Mesa., guix-commits, 2020/05/26
- 63/63: Merge branch 'master' into staging, guix-commits, 2020/05/26