On 27/01/2012 08:03, Eric Anholt wrote: > On Thu, 26 Jan 2012 16:32:24 -0800 (PST), matts...@kemper.freedesktop.org > (Matt Turner) wrote: >> Module: Mesa >> Branch: master >> Commit: 80aa78142d12b21dd7d4f0edc786af98a159a80f >> URL: >> http://cgit.freedesktop.org/mesa/mesa/commit/?id=80aa78142d12b21dd7d4f0edc786af98a159a80f >> >> Author: Matt Turner <matts...@gmail.com> >> Date: Thu Jan 26 19:31:12 2012 -0500 >> >> dri: make sure to build libdricommon.la > > Ouch. Sorry about this, folks, I built with a dirty tree and didn't > notice that the rebase off of the drirc changes wasn't good enough.
This commit breaks the ability to build when ./configured -with-driver=dri --disable-driglx-direct --with-dri-drivers=swrast for platforms which don't have DRM (See [1]), as it tries to build libdricommon.la even if we aren't building a dri driver which requires it. Attached is a patch which fixes this, although I'm not sure if that's the best way of solving this problem (it might make more sense to conditionalize on DRI_DIRS containing something other than swrast if all dri drivers are going to use libdricommon) [1] http://tinderbox.freedesktop.org/builds/2012-01-27-0017/logs/libGL-indirect-only/#build
>From c527ad8a315ffb34bfcb34053d41f39aa8011b7c Mon Sep 17 00:00:00 2001 From: Jon TURNEY <jon.tur...@dronecode.org.uk> Date: Fri, 27 Jan 2012 19:06:28 +0000 Subject: [PATCH] dri: Don't build libdricommon.la if we don't need it Refine 80aa78142d12b21dd7d4f0edc786af98a159a80f "dri: make sure to build libdricommon.la" so we don't build libdricommon if we aren't building a dri driver which needs it (i.e. if we are just building swrast) Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> --- configure.ac | 1 + src/mesa/drivers/dri/Makefile.am | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 06d400f..e173bcf 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,6 +1289,7 @@ AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes) AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes) AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes) AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes) +AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_I915_DRI = xyes || test x$HAVE_I965_DRI = xyes || test x$HAVE_NOUVEAU_DRI = xyes || test x$HAVE_R200_DRI = xyes || test x$HAVE_RADEON_DRI = xyes) dnl dnl OSMesa configuration diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am index 8b93582..48d3685 100644 --- a/src/mesa/drivers/dri/Makefile.am +++ b/src/mesa/drivers/dri/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = common +SUBDIRS = + +if HAVE_COMMON_DRI +SUBDIRS+=common +endif if HAVE_I915_DRI SUBDIRS+=i915 -- 1.7.5.1
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
