You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
853 B
29 lines
853 B
6 years ago
|
From e562763e58cd58b0a23e5d034aafedb608e3eda3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Jackson <ajax@redhat.com>
|
||
|
|
Date: Thu, 12 Nov 2015 11:10:11 -0500
|
||
|
|
Subject: [PATCH] rpath hack
|
||
|
|
|
||
|
|
Normally, rpath is undesirable. But for the X server we _know_ we need
|
||
|
|
Mesa's libGL, which will always be in %{_libdir}, and not any third-party
|
||
|
|
libGL that may be configured using ld.so.conf.
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 190d039..2ce40f4 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -1352,7 +1352,7 @@ if test "x$GLX" = xyes; then
|
||
|
|
AC_SUBST(XLIB_CFLAGS)
|
||
|
|
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||
|
|
GLX_LIBS='$(top_builddir)/glx/libglx.la'
|
||
|
|
- GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS"
|
||
|
|
+ GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS -Wl,-rpath=\$(libdir)"
|
||
|
|
else
|
||
|
|
GLX=no
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|