On Tue, Dec 09, 2003 at 04:14:09PM -0800, Eric Anholt wrote: > On Tue, 2003-12-09 at 15:52, Alan Hourihane wrote: > > On Tue, Dec 09, 2003 at 03:05:57PM -0800, Eric Anholt wrote: > > > On Tue, 2003-12-09 at 14:21, Alan Hourihane wrote: > > > > CVSROOT: /cvs/dri > > > > Module name: xc > > > > Repository: xc/xc/config/cf/ > > > > Changes by: [EMAIL PROTECTED] 03/12/09 14:21:04 > > > > > > > > Log message: > > > > move NormalLibExpat definition into OS specific config files that'll help > > > > the merge from/to XFree86 at a later stage. > > > > > > The build is still broken on FreeBSD. Would it be objected to if I make > > > the static expatness optional depending on platform? I'd rather not be > > > linking statically for our ports version of the DRI, anyway. > > > > Can you explain what's broken in the FreeBSD build ? > > > > Also - Is expat available on all FreeBSD versions ? > > First it dies with not finding expat.h. Adding EXPATINCLUDES to > common/Makefile.in fixed that. Then it dies on -lexpat because expat > wasn't built (even with HasExpat YES not being defined in FreeBSD.cf). O.k. I've fixed the Imakefile. As for HasExpat YES, there's UseExpat which should default to YES because BuildXF86DRI is set. UseExpat should override it.
> expat is available in ports, and I feel pretty safe saying everyone ever > using the DRI on FreeBSD will already have it installed (having already > installed XFree86-4-libraries which depends on it). I've never heard a > single complaint in my memory about HasExpat already being set > unconditionally in FreeBSD.cf. I've got a FreeBSD 4.3 box, I'll check if expat is installed by default. > > > What I'm trying right now is making an ExpatLibrary definition in > > > Imake.tmpl that is used in the drivers build. It's overridden for > > > non-FreeBSD in host.def. > > > > Can you send a patch first ? > > > > Alan. > > http://www.freedesktop.org/~anholt/dri-expatfix.diff > > Apoligies for the mess in it; there are some other changes in there. > It's what I've just tested on FreeBSD and Linux, with the linking > looking like it ended up right (ldd shows no libexpat on linux) > > Unless there's some compelling reason to have expat linked statically, > I'll have to end up patching to fix linking in ports, which will be > annoying. The problem of putting the StaticLibrary() bits back in host.def results in the build linking against the dynamic version when merged back into XFree86 at a later date. I'm trying to modify the OS cf files now so that we don't lose that functionality. So if you want to do.... #ifndef ExpatLibrary #define ExpatLibrary StaticLibrary($(BUILDLIBDIR),expat) #endif in the linux.cf instead of the host.def that's fine with me. That'll leave the FreeBSD and OpenBSD architectures linking dynamically. Alan. ------------------------------------------------------- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
