[gnome-continuous] Keep using llvm 3.3 from the Yocto imge for now

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 7ff453eed86a4ee60cbed776b74cd29d8d0088ad
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Mar 1 18:42:56 2017 +0000

    Keep using llvm 3.3 from the Yocto imge for now

 manifest.json                      |    3 +-
 patches/mesa-llvm-config-dir.patch |   47 ++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 786efbe..3233a9c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -390,7 +390,7 @@
                      "x86_64": "-g -m64 -mtune=generic",
                      "i686": "-g -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables"
                  },
-                 "patches": ["mesa-nv50-fix-build.patch"],
+                 "patches": ["mesa-nv50-fix-build.patch", "mesa-llvm-config-dir.patch"],
                  "config-opts": [
                      "--host=x86_64-gnomeostree-linux",
                      "--disable-asm",
@@ -403,6 +403,7 @@
                      "--enable-shared-glapi",
                      "--enable-gbm",
                      "--enable-xa",
+                     "--with-llvm-config-dir=/usr/bin/llvm3.3",
                      "--with-gallium-drivers=svga,r300,nouveau,swrast,virgl",
                      "--enable-llvm",
                                         "--with-vulkan-drivers=intel",
diff --git a/patches/mesa-llvm-config-dir.patch b/patches/mesa-llvm-config-dir.patch
new file mode 100644
index 0000000..413a191
--- /dev/null
+++ b/patches/mesa-llvm-config-dir.patch
@@ -0,0 +1,47 @@
+From 49893becc0f82bdb4b5e3bd825bc2a027c7a7eec Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor fishsoup net>
+Date: Mon, 13 Feb 2017 01:20:43 +0000
+Subject: [PATCH] Add a --llvm-config-dir option
+
+The --llvm-prefix option doesn't quite work when building against
+a yocto base, because the llvm-config-binary is in
+$bindir/llvm3.3/<targetname>-llvm-config, which is not $prefix/bin
+for any prefix.
+---
+ configure.ac | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 121457bdfd..753fe98f6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -843,6 +843,12 @@ AC_ARG_WITH([llvm-prefix],
+     [llvm_prefix="$withval"],
+     [llvm_prefix=''])
+ 
++AC_ARG_WITH([llvm-config-dir],
++    [AS_HELP_STRING([--with-llvm-config-dir],
++        [Directory where llvm-config binary lives])],
++    [llvm_config_dir="$withval"],
++    [llvm_config_dir=''])
++
+ PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=no])
+ if test "x$have_libelf" = xno; then
+    LIBELF_LIBS=''
+@@ -853,8 +859,11 @@ if test "x$have_libelf" = xno; then
+ fi
+ 
+ if test -z "$LLVM_CONFIG"; then
+-    if test -n "$llvm_prefix"; then
+-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
++    if test -n "$llvm_prefix" -a -z "$llvm_config_dir" ; then
++       llvm_config_dir="$llvm_prefix/bin"
++    fi
++    if test -n "$llvm_config_dir"; then echo ============== $llvm_config_dir/${ac_tool_prefix}llvm-config
++        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_config_dir"])
+     else
+         AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
+     fi
+-- 
+2.11.1
+