From owner-freebsd-ports Mon Mar 18 14:33:13 2002 Delivered-To: freebsd-ports@freebsd.org Received: from babylon.merseine.nu (12-216-237-91.client.mchsi.com [12.216.237.91]) by hub.freebsd.org (Postfix) with ESMTP id E8FB437B402 for ; Mon, 18 Mar 2002 14:33:08 -0800 (PST) Received: (from ishmael@localhost) by babylon.merseine.nu (8.11.6/8.11.6) id g2IMWlr89076; Mon, 18 Mar 2002 16:32:47 -0600 (CST) (envelope-from ishmael) Date: Mon, 18 Mar 2002 16:32:43 -0600 From: Jeremy Norris To: Bradley T Hughes Cc: ports@FreeBSD.org Subject: Re: HEADS UP: XFree86 4.2.0 going back in the tree Message-ID: <20020318223243.GA88976@babylon.merseine.nu> References: <20020315150609.GV53073@squall.waterspout.com> <200203180922.35707.bhughes@trolltech.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200203180922.35707.bhughes@trolltech.com> User-Agent: Mutt/1.3.28i Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org On Mon, Mar 18, 2002 at 09:22:35AM +0100, Bradley T Hughes wrote: > 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. I thought this problem went away with XFree86-4.2.0 because libGL.so.1 links to libXThrStub.so.6 (which contains weak symbols to pthread_foo)??? (Although I have older uncommitted XFree86-4.2.0_3 megaport installed locally, not new metaport, maybe it isn't the same)? Jeremy To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message