On Wed, Dec 23, 2009 at 12:28 PM, Brian Paul <brian.e.p...@gmail.com> wrote: > On Wed, Dec 23, 2009 at 11:57 AM, Adam K Kirchhoff <ad...@voicenet.com> wrote: >> Brian Paul wrote: >>> >>> On Mon, Dec 21, 2009 at 8:09 PM, Robert Noland <rnol...@2hip.net> wrote: >>> >>>> >>>> Signed-off-by: Robert Noland <rnol...@2hip.net> >>>> --- >>>> src/mesa/drivers/dri/Makefile.template | 5 ++++- >>>> 1 files changed, 4 insertions(+), 1 deletions(-) >>>> >>>> diff --git a/src/mesa/drivers/dri/Makefile.template >>>> b/src/mesa/drivers/dri/Makefile.template >>>> index 39d25ce..39a23b7 100644 >>>> --- a/src/mesa/drivers/dri/Makefile.template >>>> +++ b/src/mesa/drivers/dri/Makefile.template >>>> @@ -2,6 +2,9 @@ >>>> >>>> MESA_MODULES = $(TOP)/src/mesa/libmesa.a >>>> >>>> +GLSL_MODULES = $(TOP)/src/glsl/cl/libglslcl.a \ >>>> + $(TOP)/src/glsl/pp/libglslpp.a >>>> + >>>> COMMON_GALLIUM_SOURCES = \ >>>> ../common/utils.c \ >>>> ../common/vblank.c \ >>>> @@ -71,7 +74,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) >>>> $(WINOBJ) Makefile \ >>>> $(TOP)/src/mesa/drivers/dri/Makefile.template >>>> $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ >>>> $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \ >>>> - $(DRI_LIB_DEPS) >>>> + $(GLSL_MODULES) $(DRI_LIB_DEPS) >>>> >>>> >>>> $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) >>>> -- >>>> >>> >>> >>> This patch shouldn't be needed. The libglslcl.a and libglslpp.a >>> archives get included in the libmesa.a archive already. >>> >>> Things run OK here as-is. >>> >>> - >> >> Without this patch, r600_dri.so gives an undefined symbol for >> 'sl_pp_context_create' on FreeBSD 9.0-CURRENT amd64 and i386. With this >> patch, it works fine. Perhaps that patch shouldn't be needed, but it >> certain is needed here :-) > > It looks like the freebsd case in bin/mklib doesn't handle "unrolling" > of .a archives into constituent .o files like the Linux code does. > That's probably the root issue. > > I'm also tempted to move the src/glsl/* files down into > src/mesa/shader/slang/ to simplify the building process. I think > Michal's intention was for the GLSL compiler to live in a separate > place from the rest of Mesa to stress modularity but it's caused > trouble elsewhere. > > I'll try to look into that when I have a little time, maybe tonight or > tomorrow.
OK, here's a patch for bin/mklib which should help on FreeBSD. It also puts some common code into new subroutines. Let me know if this does the trick. -Brian ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
