From 89e76252ca3fd015544f76d0f528babe9c723938 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 1 Oct 2012 13:00:18 -0700 Subject: [PATCH] dri drivers: Link dricommon before dynamic libraries I think libtool should be handling this for us, but the build fails for Jordan because libdricommon (a static library, which uses expat) appears before -lexpat on the linker command. Reviewed-by: Jordan Justen Tested-by: Jordan Justen (cherry picked from commit 31ab61cac10bf75210134b6d8a354ac3cbd3b4da) Conflicts: src/mesa/drivers/dri/i965/Makefile.am --- src/mesa/drivers/dri/i915/Makefile.am | 4 ++-- src/mesa/drivers/dri/i965/Makefile.am | 4 ++-- src/mesa/drivers/dri/nouveau/Makefile.am | 4 ++-- src/mesa/drivers/dri/r200/Makefile.am | 4 ++-- src/mesa/drivers/dri/radeon/Makefile.am | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 7ec4c223149..cbdcf84c995 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -51,9 +51,9 @@ i915_dri_la_SOURCES = \ i915_dri_la_LDFLAGS = -module -avoid-version -shared i915_dri_la_LIBADD = \ + ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ - $(INTEL_LIBS) \ - ../common/libdricommon.la + $(INTEL_LIBS) # 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. diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index c1526aef835..c9ea1c349c0 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -52,9 +52,9 @@ i965_dri_la_SOURCES = \ i965_dri_la_LDFLAGS = -module -avoid-version -shared i965_dri_la_LIBADD = \ + ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ - $(INTEL_LIBS) \ - ../common/libdricommon.la + $(INTEL_LIBS) # 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. diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am index 82d3804f838..4589b0575a9 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -47,9 +47,9 @@ nouveau_vieux_dri_la_SOURCES = \ nouveau_vieux_dri_la_LDFLAGS = -module -avoid-version -shared nouveau_vieux_dri_la_LIBADD = \ + ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ - $(NOUVEAU_LIBS) \ - ../common/libdricommon.la + $(NOUVEAU_LIBS) # 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. diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am index 5ec53de7d3d..8920ab020a4 100644 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ b/src/mesa/drivers/dri/r200/Makefile.am @@ -49,9 +49,9 @@ r200_dri_la_SOURCES = \ r200_dri_la_LDFLAGS = -module -avoid-version -shared r200_dri_la_LIBADD = \ + ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ - $(RADEON_LIBS) \ - ../common/libdricommon.la + $(RADEON_LIBS) # 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. diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am index ec2d42e1e01..36b852e7c18 100644 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ b/src/mesa/drivers/dri/radeon/Makefile.am @@ -49,9 +49,9 @@ radeon_dri_la_SOURCES = \ radeon_dri_la_LDFLAGS = -module -avoid-version -shared radeon_dri_la_LIBADD = \ + ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ - $(RADEON_LIBS) \ - ../common/libdricommon.la + $(RADEON_LIBS) # 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.