[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freebsd-ports
Subject:    Re: HEADS UP:  XFree86 4.2.0 going back in the tree
From:       Bradley T Hughes <bhughes () trolltech ! com>
Date:       2002-03-18 8:22:35
[Download RAW message or body]

On Friday 15 March 2002 16:06, Will Andrews wrote:
> Hi,
>
> It's my intention to commit the following patch:
>
> 	http://csociety.org/~will/XFree86-4.2.0.5.diff

If at all possible, could we fix X builds on FreeBSD to not use libGL with 
threaded symbols?  This causes lots of problems with 3rd party libraries 
that use opengl code (like Qt) but don't always compile with -pthread.  
It's a very simple fix.  imake-4 and XFree86-4-libraries need a new 
patch-xthreads:

--- config/cf/FreeBSD.cf.orig   Thu Jan 24 09:17:30 2002
+++ config/cf/FreeBSD.cf        Thu Jan 24 09:17:44 2002
@@ -76,11 +76,10 @@
 #  define HasLibPthread                NO
 # endif
 # define HasPosixThreads       YES
-# define ThreadedX             YES
+# define ThreadedX             NO
 /*
  * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
  */
-# define SystemMTDefines       -D_REENTRANT -D_THREAD_SAFE
 /*
  * FreeBSD has tread-safe api but no getpwnam_r yet.
  */
@@ -91,8 +90,12 @@
 # else
 #  define BuildThreadStubLibrary  YES
 #  define NeedUIThrStubs          YES
-#  define ThreadsCompileFlags  -pthread
-#  define ThreadsLibraries     -pthread
+#  if (OSRelVersion >= 500016)
+#   define ThreadsLibraries    -lc_r
+#  else
+#   define SystemMTDefines     -D_REENTRANT -D_THREAD_SAFE
+#   define ThreadsLibraries    -pthread
+#  endif
 #  define SharedX11Reqs                $(LDPRELIB) $(XTHRSTUBLIB)
 #  define SharedXtReqs         $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) 
$(XTH
RSTUBLIB)
 # endif

This could be an option until the XFree86 people implement a real XThrStub 
library.

-- 
--
Bradley T. Hughes - bhughes at trolltech.com
Trolltech AS - Waldemar Thranes gt. 98 N-0175 Oslo, Norway



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message


[prev in list] [next in list] [prev in thread] [next in thread]