[Mesa-dev] [PATCH] build/glsl: fix android build

[Matt Turner]

On Thu, Aug 16, 2012 at 2:13 AM, Tapani Pälli <tapani.palli at intel.com> wrote:
> Commit 77a3efc6b907943903190b385fdf107c4acfcdca broke android
> build that sets its own value for GLSL_SRCDIR. Patch sets the value
> in Makefile.sources only if it is not defined previously.
>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>  src/glsl/Makefile.sources | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
> index aafb53e..1529b12 100644
> --- a/src/glsl/Makefile.sources
> +++ b/src/glsl/Makefile.sources
> @@ -1,6 +1,6 @@
>  # shared source lists for Makefile, SConscript, and Android.mk
>
> -GLSL_SRCDIR = $(top_srcdir)/src/glsl
> +GLSL_SRCDIR ?= $(top_srcdir)/src/glsl
>  GLSL_BUILDDIR = $(top_builddir)/src/glsl
>
>  # libglcpp
> --
> 1.7.11.4

This looks like it should work, but (at least on my machine) leaves
GLSL_SRCDIR undefined and breaks the autotools build.

Sorry about the Android breakage. Chad asked if the patch you mention
broke anything, but I never heard back.