On 25/01/2012 21:54, Matt Turner wrote: > On Wed, Jan 25, 2012 at 4:45 PM, Kevin H. Hobbs <[email protected]> wrote: >> On 01/25/2012 02:03 PM, Matt Turner wrote: >>> On Wed, Jan 25, 2012 at 1:42 PM, Kevin H. Hobbs <[email protected]> wrote: >>> >>> Maybe try reverting 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2? >> >> >> So this change is just the line >> >> OSMESA_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) >> $(OSMESA_LIB_DEPS) >> >> So I commented that out. >> >> I now get an OSMesa library. >> >> I do not get a shared libglapi.so in lib nor is one installed in >> the install step. > > Right, unless you're compiling with --enable-shared-glapi, you won't > get libglapi.so. I had to revert that change since it shared-glapi > doesn't work with Xlib-glx apparently.
... and reverting "always build shared glapi" didn't wrap this line above in ifeq ($(SHARED_GLAPI),1)/endif, since it wasn't there before. Sigh. I guess you could try the attached.
>From 81f07fcf0cee40b5f9fdc3bac9023f781cfb1ea9 Mon Sep 17 00:00:00 2001 From: Jon TURNEY <[email protected]> Date: Wed, 25 Jan 2012 22:14:42 +0000 Subject: [PATCH] Don't try to link OSMesa with shared glapi unless shared glapi is built This fixes the fact that 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2 is left even after the reversion in 027ce0c493a85c863df88b43f61aea34bcd4cd58 made shared glapi optional again Signed-off-by: Jon TURNEY <[email protected]> --- src/mesa/drivers/osmesa/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile index 005f4d5..6fae251 100644 --- a/src/mesa/drivers/osmesa/Makefile +++ b/src/mesa/drivers/osmesa/Makefile @@ -25,7 +25,9 @@ CORE_MESA = \ $(TOP)/src/mapi/glapi/libglapi.a \ $(TOP)/src/glsl/libglsl.a +ifeq ($(SHARED_GLAPI),1) OSMESA_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(OSMESA_LIB_DEPS) +endif .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ -- 1.7.5.1
_______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
