On Wed, 2003-08-06 at 08:00, Ian Romanick wrote:
> Nathan Gray wrote:
>
> > Ok, I see. Thanks for the info. I've added this to the compilation
> > questions section of the FAQ on dri.sourceforge.net. The *best* place to
> > put this information would be in the comment above the ProjectRoot #define,
> > IMHO.
>
> But that's a core XFree86 file. Changes there aren't likely to merge
> well to the XFree86 tree.
Not an issue, XFree86 doesn't ship host.def .
I tried to tackle this a while ago, and this patch seems to be working
so far (other driver Imakefiles probably need similar changes), but I'm
not sure it's the best approach.
--
Earthling Michel Dänzer \ Debian (powerpc), XFree86 and DRI developer
Software libre enthusiast \ http://svcs.affero.net/rm.php?r=daenzer
Index: ./lib/GL/GL/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/GL/Imakefile,v
retrieving revision 1.5
diff -p -u -r1.5 Imakefile
--- ./lib/GL/GL/Imakefile 6 May 2003 01:33:31 -0000 1.5
+++ ./lib/GL/GL/Imakefile 6 Aug 2003 09:27:00 -0000
@@ -193,7 +193,7 @@ XCOMM No built-in drivers. This is the u
* for no built-in drivers.
*/
-REQUIREDLIBS = $(BASEREQUIREDLIBS) $(OTHERREQUIREDLIBS) -lXxf86vm
+REQUIREDLIBS = $(BASEREQUIREDLIBS) $(OTHERREQUIREDLIBS) -lXxf86vm $(LDPOSTLIB)
OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS)
#if HasSharedLibraries && !SharedLibGlxWithoutPIC
Index: ./lib/GL/mesa/src/drv/r128/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/r128/Imakefile,v
retrieving revision 1.28
diff -p -u -r1.28 Imakefile
--- ./lib/GL/mesa/src/drv/r128/Imakefile 25 Mar 2003 12:48:15 -0000 1.28
+++ ./lib/GL/mesa/src/drv/r128/Imakefile 6 Aug 2003 09:27:00 -0000
@@ -55,7 +55,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(LDPOSTLIB)
#include <Library.tmpl>
Index: ./lib/GL/mesa/src/drv/r200/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/r200/Imakefile,v
retrieving revision 1.2
diff -p -u -r1.2 Imakefile
--- ./lib/GL/mesa/src/drv/r200/Imakefile 26 Aug 2002 22:16:05 -0000 1.2
+++ ./lib/GL/mesa/src/drv/r200/Imakefile 6 Aug 2003 09:27:00 -0000
@@ -54,7 +54,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(R200OBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(LDPOSTLIB)
#include <Library.tmpl>
Index: ./lib/GL/mesa/src/drv/radeon/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/radeon/Imakefile,v
retrieving revision 1.16
diff -p -u -r1.16 Imakefile
--- ./lib/GL/mesa/src/drv/radeon/Imakefile 25 Mar 2003 13:59:56 -0000 1.16
+++ ./lib/GL/mesa/src/drv/radeon/Imakefile 6 Aug 2003 09:27:00 -0000
@@ -54,7 +54,7 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r
OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
$(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS)
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(LDPOSTLIB)
#include <Library.tmpl>
Index: config/cf/host.def
===================================================================
RCS file: /cvsroot/dri/xc/xc/config/cf/host.def,v
retrieving revision 1.53
diff -p -u -r1.53 host.def
--- config/cf/host.def 1 Apr 2003 23:41:50 -0000 1.53
+++ config/cf/host.def 6 Aug 2003 09:27:00 -0000
@@ -67,7 +74,7 @@
*/
/* #define ProjectRoot /usr/X11R6-DRI */
-/* #define UsrLibDir /usr/X11R6/lib */
+#define LdPostLib -L/usr/X11R6/lib
/* Optionally turn this on to force the kernel modules to build */
/* #define BuildXF86DRM YES */
