Drop rpath hack
This commit is contained in:
parent
5dd60aa3d4
commit
d208a7f1dd
@ -1,24 +0,0 @@
|
|||||||
From 2489f2f38eb32d9dd03718a36cbdbdf13d2f8b9b 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 | 1 +
|
|
||||||
1 files changed, 1 insertions(+), 0 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index fa15a2d..a5af1e0 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -1261,6 +1261,7 @@ AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
|
|
||||||
|
|
||||||
AM_CONDITIONAL(HASHTABLE, test "x$HASHTABLE" = xyes)
|
|
||||||
|
|
||||||
+GLX_SYS_LIBS="$GLX_SYS_LIBS -Wl,-rpath=\$(libdir)"
|
|
||||||
AC_SUBST([GLX_DEFINES])
|
|
||||||
AC_SUBST([GLX_SYS_LIBS])
|
|
@ -38,8 +38,6 @@ Patch55: tigervnc-argb-runtime-ximage-byteorder-selection.patch
|
|||||||
|
|
||||||
# This is tigervnc-%%{version}/unix/xserver116.patch rebased on the latest xorg
|
# This is tigervnc-%%{version}/unix/xserver116.patch rebased on the latest xorg
|
||||||
Patch100: tigervnc-xserver120.patch
|
Patch100: tigervnc-xserver120.patch
|
||||||
# 1326867 - [RHEL7.3] GLX applications in an Xvnc session fails to start
|
|
||||||
Patch101: 0001-rpath-hack.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
Loading…
Reference in New Issue
Block a user