43 lines
1.3 KiB
Text
43 lines
1.3 KiB
Text
$NetBSD: patch-aj,v 1.2 2008/06/01 14:36:37 tnn 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
|
|
@@ -78,7 +78,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
|
|
#define LibraryRpathLoadFlags RpathLoadFlags
|
|
#endif
|
|
# ifndef SharedLibraryLoadFlags
|
|
-# define SharedLibraryLoadFlags -shared
|
|
+# define SharedLibraryLoadFlags -shared RpathLoadFlags
|
|
# endif
|
|
# ifndef PositionIndependentCFlags
|
|
# define PositionIndependentCFlags -fPIC
|
|
@@ -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
|