Thanks Marko, We're still testing after the 4.3.0 merge, so things are still unsettled right now. But thanks for the patch.
Alan. On Wed, Mar 26, 2003 at 10:32:17PM +0200, Marko Kreen wrote: > Needed following patch to get GLcore to load > in current trunk. > > The vsnprintf.c code looked dubious (mprotect,sigsetjump,...) > dropped it from Imakefile.inc, works fine without it. > > -- > marko > > Index: lib/GL/mesa/src/Imakefile.inc > =================================================================== > RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/Imakefile.inc,v > retrieving revision 1.7 > diff -u -r1.7 Imakefile.inc > --- lib/GL/mesa/src/Imakefile.inc 26 Mar 2003 12:49:11 -0000 1.7 > +++ lib/GL/mesa/src/Imakefile.inc 26 Mar 2003 18:51:36 -0000 > @@ -55,6 +55,7 @@ > $(MESABUILDDIR)light.c \ > $(MESABUILDDIR)lines.c \ > $(MESABUILDDIR)matrix.c \ > + $(MESABUILDDIR)mmath.c \ > $(MESABUILDDIR)pixel.c \ > $(MESABUILDDIR)points.c \ > $(MESABUILDDIR)polygon.c \ > @@ -75,8 +76,7 @@ > $(MESABUILDDIR)vpparse.c \ > $(MESABUILDDIR)vpparse.h \ > $(MESABUILDDIR)vpstate.c \ > - $(MESABUILDDIR)vpstate.h \ > - $(MESABUILDDIR)vsnprintf.c > + $(MESABUILDDIR)vpstate.h > > > COREMESASRCS = $(COREMESABASESRCS) \ > @@ -106,6 +106,7 @@ > $(MESABUILDDIR)swrast/s_drawpix.c \ > $(MESABUILDDIR)swrast/s_feedback.c \ > $(MESABUILDDIR)swrast/s_fog.c \ > + $(MESABUILDDIR)swrast/s_histogram.c \ > $(MESABUILDDIR)swrast/s_imaging.c \ > $(MESABUILDDIR)swrast/s_lines.c \ > $(MESABUILDDIR)swrast/s_logic.c \ > @@ -139,6 +140,7 @@ > $(MESABUILDDIR)tnl/t_vb_light.c \ > $(MESABUILDDIR)tnl/t_vb_normals.c \ > $(MESABUILDDIR)tnl/t_vb_points.c \ > + $(MESABUILDDIR)tnl/t_vb_program.c \ > $(MESABUILDDIR)tnl/t_vb_render.c \ > $(MESABUILDDIR)tnl/t_vb_texgen.c \ > $(MESABUILDDIR)tnl/t_vb_texmat.c \ > @@ -184,6 +186,7 @@ > LinkSourceFile(light.c, $(MESASRCDIR)/src) > LinkSourceFile(lines.c, $(MESASRCDIR)/src) > LinkSourceFile(matrix.c, $(MESASRCDIR)/src) > +LinkSourceFile(mmath.c, $(MESASRCDIR)/src) > LinkSourceFile(pixel.c, $(MESASRCDIR)/src) > LinkSourceFile(points.c, $(MESASRCDIR)/src) > LinkSourceFile(polygon.c, $(MESASRCDIR)/src) > @@ -205,7 +208,6 @@ > LinkSourceFile(vpparse.h, $(MESASRCDIR)/src) > LinkSourceFile(vpstate.c, $(MESASRCDIR)/src) > LinkSourceFile(vpstate.h, $(MESASRCDIR)/src) > -LinkSourceFile(vsnprintf.c, $(MESASRCDIR)/src) > > #endif > > @@ -252,6 +254,7 @@ > $(MESABUILDDIR)light.o \ > $(MESABUILDDIR)lines.o \ > $(MESABUILDDIR)matrix.o \ > + $(MESABUILDDIR)mmath.o \ > $(MESABUILDDIR)pixel.o \ > $(MESABUILDDIR)points.o \ > $(MESABUILDDIR)polygon.o \ > @@ -269,8 +272,7 @@ > $(MESABUILDDIR)vtxfmt.o \ > $(MESABUILDDIR)vpexec.o \ > $(MESABUILDDIR)vpparse.o \ > - $(MESABUILDDIR)vpstate.o \ > - $(MESABUILDDIR)vsnprintf.o > + $(MESABUILDDIR)vpstate.o > > > COREMESAOBJS = $(COREMESABASEOBJS) \ > @@ -323,6 +325,7 @@ > $(MESABUILDDIR)unshared/light.o \ > $(MESABUILDDIR)unshared/lines.o \ > $(MESABUILDDIR)unshared/matrix.o \ > + $(MESABUILDDIR)unshared/mmath.o \ > $(MESABUILDDIR)unshared/pixel.o \ > $(MESABUILDDIR)unshared/points.o \ > $(MESABUILDDIR)unshared/polygon.o \ > @@ -340,8 +343,7 @@ > $(MESABUILDDIR)unshared/vtxfmt.o \ > $(MESABUILDDIR)unshared/vpexec.o \ > $(MESABUILDDIR)unshared/vpparse.o \ > - $(MESABUILDDIR)unshared/vpstate.o \ > - $(MESABUILDDIR)unshared/vsnprintf.o > + $(MESABUILDDIR)unshared/vpstate.o > #else > COREMESABASEUOBJS = $(COREMESABASEOBJS) > #endif > @@ -395,6 +397,7 @@ > $(MESABUILDDIR)debugger/light.o \ > $(MESABUILDDIR)debugger/lines.o \ > $(MESABUILDDIR)debugger/matrix.o \ > + $(MESABUILDDIR)debugger/mmath.o \ > $(MESABUILDDIR)debugger/pixel.o \ > $(MESABUILDDIR)debugger/points.o \ > $(MESABUILDDIR)debugger/polygon.o \ > @@ -412,8 +415,7 @@ > $(MESABUILDDIR)debugger/vtxfmt.o \ > $(MESABUILDDIR)debugger/vpexec.o \ > $(MESABUILDDIR)debugger/vpparse.o \ > - $(MESABUILDDIR)debugger/vpstate.o \ > - $(MESABUILDDIR)debugger/vsnprintf.o > + $(MESABUILDDIR)debugger/vpstate.o > > COREMESADOBJS = $(COREMESABASEDOBJS) \ > $(MESA_AC_DOBJS) \ > @@ -464,6 +466,7 @@ > $(MESABUILDDIR)profiled/light.o \ > $(MESABUILDDIR)profiled/lines.o \ > $(MESABUILDDIR)profiled/matrix.o \ > + $(MESABUILDDIR)profiled/mmath.o \ > $(MESABUILDDIR)profiled/pixel.o \ > $(MESABUILDDIR)profiled/points.o \ > $(MESABUILDDIR)profiled/polygon.o \ > @@ -481,8 +484,7 @@ > $(MESABUILDDIR)profiled/vtxfmt.o \ > $(MESABUILDDIR)profiled/vpexec.o \ > $(MESABUILDDIR)profiled/vpparse.o \ > - $(MESABUILDDIR)profiled/vpstate.o \ > - $(MESABUILDDIR)profiled/vsnprintf.o > + $(MESABUILDDIR)profiled/vpstate.o > > COREMESAPOBJS = $(COREMESABASEPOBJS) \ > $(MESA_AC_POBJS) \ > Index: lib/GL/mesa/src/swrast/Imakefile.inc > =================================================================== > RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/swrast/Imakefile.inc,v > retrieving revision 1.4 > diff -u -r1.4 Imakefile.inc > --- lib/GL/mesa/src/swrast/Imakefile.inc 25 Mar 2003 18:52:09 -0000 1.4 > +++ lib/GL/mesa/src/swrast/Imakefile.inc 26 Mar 2003 18:51:37 -0000 > @@ -20,6 +20,7 @@ > $(MESASWRASTBUILDDIR)s_drawpix.c \ > $(MESASWRASTBUILDDIR)s_feedback.c \ > $(MESASWRASTBUILDDIR)s_fog.c \ > + $(MESASWRASTBUILDDIR)s_histogram.c \ > $(MESASWRASTBUILDDIR)s_imaging.c \ > $(MESASWRASTBUILDDIR)s_lines.c \ > $(MESASWRASTBUILDDIR)s_logic.c \ > @@ -49,6 +50,7 @@ > LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/swrast) > LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/swrast) > LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/swrast) > +LinkSourceFile(s_histogram.c, $(MESASRCDIR)/src/swrast) > LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/swrast) > LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/swrast) > LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/swrast) > @@ -78,6 +80,7 @@ > $(MESASWRASTBUILDDIR)s_drawpix.o \ > $(MESASWRASTBUILDDIR)s_feedback.o \ > $(MESASWRASTBUILDDIR)s_fog.o \ > + $(MESASWRASTBUILDDIR)s_histogram.o \ > $(MESASWRASTBUILDDIR)s_imaging.o \ > $(MESASWRASTBUILDDIR)s_lines.o \ > $(MESASWRASTBUILDDIR)s_logic.o \ > @@ -107,6 +110,7 @@ > $(MESASWRASTBUILDDIR)unshared/s_drawpix.o \ > $(MESASWRASTBUILDDIR)unshared/s_feedback.o \ > $(MESASWRASTBUILDDIR)unshared/s_fog.o \ > + $(MESASWRASTBUILDDIR)unshared/s_histogram.o \ > $(MESASWRASTBUILDDIR)unshared/s_imaging.o \ > $(MESASWRASTBUILDDIR)unshared/s_lines.o \ > $(MESASWRASTBUILDDIR)unshared/s_logic.o \ > @@ -138,6 +142,7 @@ > $(MESASWRASTBUILDDIR)debugger/s_drawpix.o \ > $(MESASWRASTBUILDDIR)debugger/s_feedback.o \ > $(MESASWRASTBUILDDIR)debugger/s_fog.o \ > + $(MESASWRASTBUILDDIR)debugger/s_histogram.o \ > $(MESASWRASTBUILDDIR)debugger/s_imaging.o \ > $(MESASWRASTBUILDDIR)debugger/s_lines.o \ > $(MESASWRASTBUILDDIR)debugger/s_logic.o \ > @@ -166,6 +171,7 @@ > $(MESASWRASTBUILDDIR)profiled/s_drawpix.o \ > $(MESASWRASTBUILDDIR)profiled/s_feedback.o \ > $(MESASWRASTBUILDDIR)profiled/s_fog.o \ > + $(MESASWRASTBUILDDIR)profiled/s_histogram.o \ > $(MESASWRASTBUILDDIR)profiled/s_imaging.o \ > $(MESASWRASTBUILDDIR)profiled/s_lines.o \ > $(MESASWRASTBUILDDIR)profiled/s_logic.o \ > Index: lib/GL/mesa/src/tnl/Imakefile.inc > =================================================================== > RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/tnl/Imakefile.inc,v > retrieving revision 1.3 > diff -u -r1.3 Imakefile.inc > --- lib/GL/mesa/src/tnl/Imakefile.inc 25 Mar 2003 18:52:09 -0000 1.3 > +++ lib/GL/mesa/src/tnl/Imakefile.inc 26 Mar 2003 18:51:37 -0000 > @@ -23,6 +23,7 @@ > $(MESATNLBUILDDIR)t_vb_light.c \ > $(MESATNLBUILDDIR)t_vb_normals.c \ > $(MESATNLBUILDDIR)t_vb_points.c \ > + $(MESATNLBUILDDIR)t_vb_program.c \ > $(MESATNLBUILDDIR)t_vb_render.c \ > $(MESATNLBUILDDIR)t_vb_texgen.c \ > $(MESATNLBUILDDIR)t_vb_texmat.c \ > @@ -46,6 +47,7 @@ > LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/tnl) > LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/tnl) > LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/tnl) > +LinkSourceFile(t_vb_program.c, $(MESASRCDIR)/src/tnl) > LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/tnl) > LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/tnl) > LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/tnl) > @@ -69,6 +71,7 @@ > $(MESATNLBUILDDIR)t_vb_light.o \ > $(MESATNLBUILDDIR)t_vb_normals.o \ > $(MESATNLBUILDDIR)t_vb_points.o \ > + $(MESATNLBUILDDIR)t_vb_program.o \ > $(MESATNLBUILDDIR)t_vb_render.o \ > $(MESATNLBUILDDIR)t_vb_texgen.o \ > $(MESATNLBUILDDIR)t_vb_texmat.o \ > @@ -92,6 +95,7 @@ > $(MESATNLBUILDDIR)unshared/t_vb_light.o \ > $(MESATNLBUILDDIR)unshared/t_vb_normals.o \ > $(MESATNLBUILDDIR)unshared/t_vb_points.o \ > + $(MESATNLBUILDDIR)unshared/t_vb_program.o \ > $(MESATNLBUILDDIR)unshared/t_vb_render.o \ > $(MESATNLBUILDDIR)unshared/t_vb_texgen.o \ > $(MESATNLBUILDDIR)unshared/t_vb_texmat.o \ > @@ -117,6 +121,7 @@ > $(MESATNLBUILDDIR)debugger/t_vb_light.o \ > $(MESATNLBUILDDIR)debugger/t_vb_normals.o \ > $(MESATNLBUILDDIR)debugger/t_vb_points.o \ > + $(MESATNLBUILDDIR)debugger/t_vb_program.o \ > $(MESATNLBUILDDIR)debugger/t_vb_render.o \ > $(MESATNLBUILDDIR)debugger/t_vb_texgen.o \ > $(MESATNLBUILDDIR)debugger/t_vb_texmat.o \ > @@ -139,6 +144,7 @@ > $(MESATNLBUILDDIR)profiled/t_vb_light.o \ > $(MESATNLBUILDDIR)profiled/t_vb_normals.o \ > $(MESATNLBUILDDIR)profiled/t_vb_points.o \ > + $(MESATNLBUILDDIR)profiled/t_vb_program.o \ > $(MESATNLBUILDDIR)profiled/t_vb_render.o \ > $(MESATNLBUILDDIR)profiled/t_vb_texgen.o \ > $(MESATNLBUILDDIR)profiled/t_vb_texmat.o \ ------------------------------------------------------- This SF.net email is sponsored by: The Definitive IT and Networking Event. Be There! NetWorld+Interop Las Vegas 2003 -- Register today! http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
