diff options
Diffstat (limited to 'x11-servers/xorg-server/files/patch-FreeBSD.cf')
| -rw-r--r-- | x11-servers/xorg-server/files/patch-FreeBSD.cf | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf index 391afe1b7cae..b2c195f77b75 100644 --- a/x11-servers/xorg-server/files/patch-FreeBSD.cf +++ b/x11-servers/xorg-server/files/patch-FreeBSD.cf @@ -1,5 +1,5 @@ --- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 -+++ config/cf/FreeBSD.cf Sat Sep 11 15:18:01 2004 ++++ config/cf/FreeBSD.cf Wed Dec 29 13:40:20 2004 @@ -78,6 +78,7 @@ #define HasIssetugid YES #define HasPoll YES @@ -8,37 +8,49 @@ #if OSMajorVersion >= 4 #define HasGetIfAddrs YES -@@ -117,14 +118,8 @@ +@@ -116,15 +117,14 @@ + # endif # if (OSRelVersion < 500043) # define NeedUIThrStubs YES - # endif +-# endif -# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread -# elif (OSRelVersion >= 500016) -# define ThreadsLibraries -lc_r --# else ++# define BuildThreadStubLibrary YES ++# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) ++# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) + # else -# define ThreadsLibraries -pthread --# endif ++# define BuildThreadStubLibrary NO + # endif -# define SystemMTDefines -D_THREAD_SAFE +# define ThreadsLibraries FreeBSDPTHREAD_LIBS +# define SystemMTDefines FreeBSDPTHREAD_CFLAGS #endif /* This fixes linking C programs against libGLU on FreeBSD 3.x */ -@@ -173,10 +168,10 @@ +@@ -172,12 +172,14 @@ + #endif #endif - #ifndef CcCmd +-#ifndef CcCmd -#define CcCmd cc -+#define CcCmd FreeBSDCC - #endif - #ifndef CplusplusCmd +-#endif +-#ifndef CplusplusCmd -#define CplusplusCmd c++ ++#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) ++#define CcCmd $(CLIENTENVSETUP) FreeBSDCC ++#define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX ++#else ++#define CcCmd FreeBSDCC +#define CplusplusCmd FreeBSDCXX #endif ++ #define CppCmd /usr/bin/cpp #define PreProcessCmd CppCmd -@@ -338,7 +333,7 @@ + #define StandardCppOptions -traditional +@@ -338,7 +340,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -47,7 +59,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -463,18 +458,8 @@ +@@ -463,18 +465,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif |