On Fri, 16 Mar 2012 16:29:32 -0400, Kristian Høgsberg <k...@bitplanet.net> wrote: > This fixes a build problem where EGL links to libgbm.la, which encodes > a relative path to it's libglapi.so dependency. The relative path > breaks when the linker tries to resolve it from src/egl/main instead > of src/gbm. Typically we silently fall back to the system > libglapi.so, which is wrong and break when there isn't one. > > Morale of the story: don't mix mklib and libtool.
> diff --git a/src/mapi/shared-glapi/Makefile.am > b/src/mapi/shared-glapi/Makefile.am > new file mode 100644 > index 0000000..d24a57e > --- /dev/null > +++ b/src/mapi/shared-glapi/Makefile.am > @@ -0,0 +1,23 @@ > +# Used by OpenGL ES or when --enable-shared-glapi is specified > + > +TOP := ../../.. > +GLAPI = $(top_srcdir)/src/mapi/glapi > +include $(top_srcdir)/src/mapi/mapi/sources.mak > + > +lib_LTLIBRARIES = libglapi.la > +libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) > + > +include $(GLAPI)/gen/glapi_gen.mk > +glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) > + $(call glapi_gen_mapi,$<,shared-glapi) This file should be included in BUILT_SOURCES in order to make dependency generation work right. (http://www.gnu.org/software/automake/manual/automake.html#Sources) Other than that, Reviewed-by: Eric Anholt <e...@anholt.net>
pgp3lDmIcpAUs.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
