diff options
| author | Egbert Eich <eich@suse.de> | 2004-01-29 08:06:33 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-01-29 08:06:33 +0000 |
| commit | 0f069ce681ea5268712b6cb19a7baae1dea4550a (patch) | |
| tree | c06a8f15346fdc53eddd2d5520da95f85625e435 /lnxLib.rules | |
| parent | b777f9330ca35d78ee1fdfd69cfd90023c08da7a (diff) | |
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004xf86-012804-2330
Diffstat (limited to 'lnxLib.rules')
| -rw-r--r-- | lnxLib.rules | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/lnxLib.rules b/lnxLib.rules index 5d5407f..29cefc5 100644 --- a/lnxLib.rules +++ b/lnxLib.rules @@ -1,5 +1,5 @@ XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.53 2004/01/27 01:37:39 dawes Exp $ /* * Linux shared library rules (DLL & ELF versions) @@ -11,6 +11,10 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ # define ForceNormalLib NO #endif +#ifndef UseRpath +#define UseRpath NO +#endif + #ifndef SharedOldX # define SharedOldX NO #endif @@ -63,6 +67,16 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ # ifndef ShLibIncludeFile # define ShLibIncludeFile <lnxLib.tmpl> # endif +#ifndef RpathLoadFlags +#if UseRpath +#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) +#else +#define RpathLoadFlags /**/ +#endif +#endif +#ifndef LibraryRpathLoadFlags +#define LibraryRpathLoadFlags RpathLoadFlags +#endif # ifndef SharedLibraryLoadFlags # define SharedLibraryLoadFlags -shared # endif @@ -76,17 +90,17 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ # if LinuxBinUtilsMajorVersion >= 26 # ifdef UseInstalled # if LinuxBinUtilsMajorVersion < 27 -# define ExtraLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH) +# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH) # endif # else -# define ExtraLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) +# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) # endif # else -# define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) +# define ExtraLoadFlags RpathLoadFlags # endif # endif # ifndef HardCodeLibdirFlag -# define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH) +# define HardCodeLibdirFlag RpathLoadFlags # endif # if !defined(ShlibGlobalsFlags) # define ShlibGlobalsFlags -Wl,-Bsymbolic |