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 /FreeBSD.cf | |
| parent | b777f9330ca35d78ee1fdfd69cfd90023c08da7a (diff) | |
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004xf86-012804-2330
Diffstat (limited to 'FreeBSD.cf')
| -rw-r--r-- | FreeBSD.cf | 55 |
1 files changed, 43 insertions, 12 deletions
@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ XCOMM XCOMM XCOMM -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.145 2003/12/06 19:24:11 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.147 2004/01/28 01:46:21 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -321,22 +321,53 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe * and they can remove it from the list of directories they add to ld.so.cache * in their /etc/rc file. */ -#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) -#ifndef ExtraLoadFlags -#if UseElfFormat -#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR) -#else -#define ExtraLoadFlags -Wl,-R,$(USRLIBDIRPATH) + +#ifndef UseRpath +# define UseRpath YES #endif + +#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) + +# ifndef RpathLoadFlags +# if UseRpath +# if UseElfFormat +# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) +# else +# define RpathLoadFlags -Wl,-R,$(USRLIBDIRPATH) +# endif +# else +# define RpathLoadFlags /**/ +# endif +# endif + +# ifndef ExtraLoadFlags +# if UseElfFormat && !defined(UseInstalled) +# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) +# else +# define ExtraLoadFlags RpathLoadFlags +# endif +# endif + #endif + +#ifndef LibraryRpathLoadFlags +# if UseRpath +# if UseElfFormat +# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) +# else +# define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) +# endif +# else +# define LibraryRpathLoadFlags /**/ +# endif #endif #ifndef SharedLibraryLoadFlags -#if UseElfFormat -#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH) -#else -#define SharedLibraryLoadFlags -Bshareable -R $(USRLIBDIRPATH) -#endif +# if UseElfFormat +# define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags +# else +# define SharedLibraryLoadFlags -Bshareable LibraryRpathLoadFlags +# endif #endif #ifndef GnuMallocLibrary |