diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-01-25 10:24:14 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-01-25 10:42:32 +0100 |
| commit | 710d8a697c6050f5a75313006aaad65f0272fc19 (patch) | |
| tree | 5d70a56b256753c88af6984a9ff34a0c2c3ba492 /rules/mesalib.make | |
| parent | 956a5a6629fe3dc0a0d42ff439addac6a34209c8 (diff) | |
| download | ptxdist-710d8a697c6050f5a75313006aaad65f0272fc19.tar.gz ptxdist-710d8a697c6050f5a75313006aaad65f0272fc19.tar.xz | |
mesalib: cleanup configure options
Don't autodetect which state trackers should be compiled.
This fixes a compile error on ARM when mesalib is rebuilt after
building xorg-server.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/mesalib.make')
| -rw-r--r-- | rules/mesalib.make | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/rules/mesalib.make b/rules/mesalib.make index 54cac0d07..a78f17b39 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -97,6 +97,11 @@ MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_TRIDENT) += trident MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_UNICHROME) += unichrome MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_FFB) += ffb +MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_XLIB) += glx +MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI) += dri +# circular dependency with xorg +#MESALIB_STATE_TRACKERS-$(PTXCONF_MESALIB_DRIVER_DRI) += xorg + MESALIB_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --disable-static \ @@ -119,42 +124,37 @@ MESALIB_AUTOCONF := \ # the 32/64 bit options result in CFLAGS -> -m32 and -m64 which seem # only to be available on x86 -ifdef PTXCONF_ARCH_X86 -MESALIB_AUTOCONF += \ - --enable-32-bit \ - --disable-64-bit - ifdef PTXCONF_MESALIB_DRI_GALLIUM MESALIB_AUTOCONF += \ - --enable-gallium + --enable-gallium \ + --with-state-trackers=$(subst $(space),$(comma),$(MESALIB_STATE_TRACKERS-y)) else MESALIB_AUTOCONF += \ - --disable-gallium + --disable-gallium \ + --without-state-trackers endif -ifdef PTXCONF_MESALIB_DRI_INTEL_GALLIUM +ifdef PTXCONF_ARCH_X86 MESALIB_AUTOCONF += \ - --enable-gallium-intel + --enable-32-bit \ + --disable-64-bit + +ifdef PTXCONF_MESALIB_DRI_INTEL_GALLIUM +MESALIB_AUTOCONF += --enable-gallium-intel else -MESALIB_AUTOCONF += \ - --disable-gallium-intel +MESALIB_AUTOCONF += --disable-gallium-intel endif endif ifdef PTXCONF_ARCH_ARM -MESALIB_AUTOCONF += \ - --disable-gallium-intel +MESALIB_AUTOCONF += --disable-gallium-intel endif -ifdef PTXCONF_MESALIB_DRIVER_XLIB - MESALIB_AUTOCONF += --enable-gl-osmesa -endif -ifdef PTXCONF_MESALIB_DRIVER_DRI - MESALIB_AUTOCONF += --enable-gl-osmesa -endif ifdef PTXCONF_MESALIB_DRIVER_OSMESA - MESALIB_AUTOCONF += --disable-gl-osmesa +MESALIB_AUTOCONF += --disable-gl-osmesa +else +MESALIB_AUTOCONF += --enable-gl-osmesa endif # ---------------------------------------------------------------------------- |