summaryrefslogtreecommitdiff
path: root/x11/xorg-cf-files/patches/patch-aj
blob: 186f26f953e07ab7fc73ae1e1d212204c85f48ea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
$NetBSD: patch-aj,v 1.1 2008/01/25 18:55:02 joerg Exp $

Force Rpath usage on Linux. For reasons analysed in details,
the binutils detection seems to fail.

--- lnxLib.rules.orig	2004-04-23 20:41:58.000000000 +0200
+++ lnxLib.rules
@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
 #endif
 
 #ifndef UseRpath
-#define UseRpath NO
+#define UseRpath YES
 #endif
 
 #ifndef SharedOldX
@@ -87,17 +87,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
 #  define PositionIndependentCplusplusFlags -fPIC
 # endif
 # ifndef ExtraLoadFlags
-#  if LinuxBinUtilsMajorVersion >= 26
-#   ifdef UseInstalled
-#    if LinuxBinUtilsMajorVersion < 27
-#     define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
-#    endif
-#   else
 #    define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-#   endif
-#  else
-#   define ExtraLoadFlags RpathLoadFlags
-#  endif
 # endif
 # ifndef HardCodeLibdirFlag
 #  define HardCodeLibdirFlag RpathLoadFlags