Jon, It looks like this commit (and the other ones in the series) aren't present in the mesa git tree. It also looks like the last commit was pushed twice, and is present with the hash from the second time.
Stéphane On Tue, Mar 5, 2013 at 5:26 AM, Jon TURNEY <jtur...@kemper.freedesktop.org> wrote: > Module: Mesa > Branch: master > Commit: 5ee414013fee48d6a7575512f7e8cb7be153c416 > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ee414013fee48d6a7575512f7e8cb7be153c416 > > Author: Jon TURNEY <jon.tur...@dronecode.org.uk> > Date: Fri Jan 11 19:14:32 2013 +0000 > > Don't bother making compatibilty symlinks > > Don't bother making compatibilty symlinks. This doesn't work for us anyhow as > we > make .dll, not .so > > --- > > src/egl/main/Makefile.am | 8 +------- > src/gallium/targets/libgl-xlib/Makefile.am | 6 ------ > src/glx/Makefile.am | 7 ------- > src/mapi/shared-glapi/Makefile.am | 6 ------ > src/mesa/drivers/dri/swrast/Makefile.am | 6 ------ > src/mesa/drivers/osmesa/Makefile.am | 9 --------- > src/mesa/drivers/x11/Makefile.am | 9 --------- > src/mesa/libdricore/Makefile.am | 7 ------- > 8 files changed, 1 insertions(+), 57 deletions(-) > > diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am > index ca5257a..bf8221d 100644 > --- a/src/egl/main/Makefile.am > +++ b/src/egl/main/Makefile.am > @@ -1,3 +1,4 @@ > + > # Copyright © 2012 Intel Corporation > # > # Permission is hereby granted, free of charge, to any person obtaining a > @@ -116,13 +117,6 @@ libEGL_la_LIBADD += ../drivers/dri2/libegl_dri2.la > libEGL_la_LIBADD += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIBS) > endif > > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: libEGL.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); > - ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1 > - ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so > - > pkgconfigdir = $(libdir)/pkgconfig > > pkgconfig_DATA = egl.pc > diff --git a/src/gallium/targets/libgl-xlib/Makefile.am > b/src/gallium/targets/libgl-xlib/Makefile.am > index cca0da4..4817766 100644 > --- a/src/gallium/targets/libgl-xlib/Makefile.am > +++ b/src/gallium/targets/libgl-xlib/Makefile.am > @@ -70,9 +70,3 @@ libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS) > # Mention a dummy pure C file to trigger generation of the $(LINK) variable > nodist_EXTRA_libGL_la_SOURCES = dummy-c.c > endif > - > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: libGL.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium > - ln -f .libs/libGL.so* $(top_builddir)/$(LIB_DIR)/gallium/ > diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am > index 4aa900a..5fc9408 100644 > --- a/src/glx/Makefile.am > +++ b/src/glx/Makefile.am > @@ -106,10 +106,3 @@ GL_LDFLAGS = \ > lib@GL_LIB@_la_SOURCES = > lib@GL_LIB@_la_LIBADD = $(GL_LIBS) > lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS) > - > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: lib@GL_LIB@.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); > - ln -f .libs/lib@GL_LIB@.so.1.2.0 > $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1 > - ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so > diff --git a/src/mapi/shared-glapi/Makefile.am > b/src/mapi/shared-glapi/Makefile.am > index d215c43..79e3334 100644 > --- a/src/mapi/shared-glapi/Makefile.am > +++ b/src/mapi/shared-glapi/Makefile.am > @@ -24,9 +24,3 @@ AM_CPPFLAGS = > \ > -I$(top_builddir)/src/mapi \ > -DMAPI_MODE_GLAPI \ > -DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\" > - > -all-local: libglapi.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR) > - ln -f .libs/libglapi.so.0.0.0 > $(top_builddir)/$(LIB_DIR)/libglapi.so.0.0.0 > - ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0 > - ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so > diff --git a/src/mesa/drivers/dri/swrast/Makefile.am > b/src/mesa/drivers/dri/swrast/Makefile.am > index 3e53907..09a3dfd 100644 > --- a/src/mesa/drivers/dri/swrast/Makefile.am > +++ b/src/mesa/drivers/dri/swrast/Makefile.am > @@ -46,9 +46,3 @@ swrast_dri_la_SOURCES = \ > swrast_dri_la_LDFLAGS = -module -avoid-version -shared > swrast_dri_la_LIBADD = \ > $(DRI_LIB_DEPS) > - > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: swrast_dri.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); > - ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/swrast_dri.so; > diff --git a/src/mesa/drivers/osmesa/Makefile.am > b/src/mesa/drivers/osmesa/Makefile.am > index c4b178b..054344c 100644 > --- a/src/mesa/drivers/osmesa/Makefile.am > +++ b/src/mesa/drivers/osmesa/Makefile.am > @@ -49,14 +49,5 @@ lib@OSMESA_LIB@_la_LIBADD = \ > $(GLAPI_LIB) \ > $(OSMESA_LIB_DEPS) > > -if BUILD_SHARED > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: lib@OSMESA_LIB@.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); > - ln -f .libs/lib@OSMESA_LIB@.so > $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; > - ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ > $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@; > -endif > - > pkgconfigdir = $(libdir)/pkgconfig > pkgconfig_DATA = osmesa.pc > diff --git a/src/mesa/drivers/x11/Makefile.am > b/src/mesa/drivers/x11/Makefile.am > index 2b0a163..de7a930 100644 > --- a/src/mesa/drivers/x11/Makefile.am > +++ b/src/mesa/drivers/x11/Makefile.am > @@ -64,12 +64,3 @@ lib@GL_LIB@_la_LDFLAGS = \ > -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ > -no-undefined \ > $(GL_LIB_DEPS) > - > -if BUILD_SHARED > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: lib@GL_LIB@.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); > - ln -f .libs/lib@GL_LIB@.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) > $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.$(GL_MAJOR) > - ln -sf lib@GL_LIB@.so.$(GL_MAJOR) > $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so > -endif > diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am > index 753548e..973c008 100644 > --- a/src/mesa/libdricore/Makefile.am > +++ b/src/mesa/libdricore/Makefile.am > @@ -67,13 +67,6 @@ endif > > if HAVE_DRI > lib_LTLIBRARIES = libdricore@VERSION@.la > - > -# Provide compatibility with scripts for the old Mesa build system for > -# a while by putting a link to the driver into /lib of the build tree. > -all-local: libdricore@VERSION@.la > - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); > - ln -f .libs/libdricore@VERSION@.so.1.0.0 > $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1; > - ln -sf libdricore@VERSION@.so.1 > $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so > endif > > CLEANFILES = \ > > _______________________________________________ > mesa-commit mailing list > mesa-com...@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-commit _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
