From 5a746104e3c91400099377fcc4bd763b9e91fb96 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:51:01 +0200 Subject: 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(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ad8f06b0dc..788fe7c5c4 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" -- cgit v1.2.3