diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-01 13:44:07 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-01 13:44:07 +0000 |
| commit | 46ce9ff430b5b8e74c8c6995265fefe2801deca6 (patch) | |
| tree | 0b67b3ac9f499429bc5943eae12f4adfe5cf6f56 /FreeBSD.cf | |
| parent | 6c6745ad313a1303c43ff6ba453f703919b90525 (diff) | |
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).
Diffstat (limited to 'FreeBSD.cf')
| -rw-r--r-- | FreeBSD.cf | 58 |
1 files changed, 45 insertions, 13 deletions
@@ -1,9 +1,9 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM platform: $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.1.4.3 2003/12/20 00:28:21 kaleb Exp $ +XCOMM platform: $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.1.4.5 2004/02/23 21:31:43 kaleb 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.148 2004/02/07 04:30:15 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -131,6 +131,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # endif # if (OSRelVersion >= 500016) # define ThreadsLibraries -lc_r +# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc # else # define ThreadsLibraries -pthread # endif @@ -326,22 +327,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 |