[Mesa-dev] [PATCH] osmesa: mklib requires arguments before objects

[Brian Paul]

On 01/23/2011 09:22 PM, Christopher James Halse Rogers wrote:
> Fixes the build when selecting driver=osmesa and building static libraries.
> Otherwise, mklib tries to add the ‘-ltalloc’ object to the archive, which
> obviously fails.
>
> Clients which statically link to osmesa will need to link to libtalloc also,
> as specified in the Libs.private of osmesa.pc.
>
> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=33360
>
> Signed-off-by: Christopher James Halse Rogers<christopher.halse.rogers at canonical.com>
> ---
>   src/mesa/drivers/osmesa/Makefile |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
> index 50dd452..d65128c 100644
> --- a/src/mesa/drivers/osmesa/Makefile
> +++ b/src/mesa/drivers/osmesa/Makefile
> @@ -40,7 +40,7 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
>   		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
>   		-install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \
>   		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
> -		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) $(TALLOC_LIBS)
> +		$(OSMESA_LIB_DEPS) $(TALLOC_LIBS) $(OBJECTS) $(CORE_MESA)


Looks good.  I'll commit it.

-Brian