diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch index 9f7002a028..76b5a18ede 100644 --- a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch +++ b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001 | 1 | From e21ce89f7ae6964f196086ff325d79e4a3b5acd8 Mon Sep 17 00:00:00 2001 |
2 | From: Jonathan Liu <net147@gmail.com> | 2 | From: Jonathan Liu <net147@gmail.com> |
3 | Date: Tue, 4 Jun 2013 06:04:44 -0700 | 3 | Date: Tue, 4 Jun 2013 06:04:44 -0700 |
4 | Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling | 4 | Subject: [PATCH 1/4] configure: Avoid use of AC_CHECK_FILE for cross compiling |
5 | 5 | ||
6 | The AC_CHECK_FILE macro can't be used for cross compiling as it will | 6 | The AC_CHECK_FILE macro can't be used for cross compiling as it will |
7 | result in "error: cannot check for file existence when cross compiling". | 7 | result in "error: cannot check for file existence when cross compiling". |
@@ -17,10 +17,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
17 | 1 file changed, 6 insertions(+), 6 deletions(-) | 17 | 1 file changed, 6 insertions(+), 6 deletions(-) |
18 | 18 | ||
19 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
20 | index 36065f1..2b4a374 100644 | 20 | index 70c598e..67b8c40 100644 |
21 | --- a/configure.ac | 21 | --- a/configure.ac |
22 | +++ b/configure.ac | 22 | +++ b/configure.ac |
23 | @@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then | 23 | @@ -1630,8 +1630,8 @@ if test "x$enable_gallium_llvm" = xyes; then |
24 | CLANG_LIBDIR=${LLVM_LIBDIR} | 24 | CLANG_LIBDIR=${LLVM_LIBDIR} |
25 | fi | 25 | fi |
26 | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} | 26 | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} |
@@ -31,7 +31,7 @@ index 36065f1..2b4a374 100644 | |||
31 | fi | 31 | fi |
32 | else | 32 | else |
33 | MESA_LLVM=0 | 33 | MESA_LLVM=0 |
34 | @@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then | 34 | @@ -1861,7 +1861,7 @@ if test "x$MESA_LLVM" != x0; then |
35 | if test "x$with_llvm_shared_libs" = xyes; then | 35 | if test "x$with_llvm_shared_libs" = xyes; then |
36 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, | 36 | dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, |
37 | LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` | 37 | LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` |
@@ -40,7 +40,7 @@ index 36065f1..2b4a374 100644 | |||
40 | 40 | ||
41 | if test "x$llvm_have_one_so" = xyes; then | 41 | if test "x$llvm_have_one_so" = xyes; then |
42 | dnl LLVM was built using auto*, so there is only one shared object. | 42 | dnl LLVM was built using auto*, so there is only one shared object. |
43 | @@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then | 43 | @@ -1869,8 +1869,8 @@ if test "x$MESA_LLVM" != x0; then |
44 | else | 44 | else |
45 | dnl If LLVM was built with CMake, there will be one shared object per | 45 | dnl If LLVM was built with CMake, there will be one shared object per |
46 | dnl component. | 46 | dnl component. |
@@ -51,7 +51,7 @@ index 36065f1..2b4a374 100644 | |||
51 | Please make sure you have built llvm with the --enable-shared option | 51 | Please make sure you have built llvm with the --enable-shared option |
52 | and that your llvm libraries are installed in $LLVM_LIBDIR | 52 | and that your llvm libraries are installed in $LLVM_LIBDIR |
53 | If you have installed your llvm libraries to a different directory you | 53 | If you have installed your llvm libraries to a different directory you |
54 | @@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then | 54 | @@ -1881,7 +1881,7 @@ if test "x$MESA_LLVM" != x0; then |
55 | --enable-opencl | 55 | --enable-opencl |
56 | If you do not want to build with llvm shared libraries and instead want to | 56 | If you do not want to build with llvm shared libraries and instead want to |
57 | use llvm static libraries then remove these options from your configure | 57 | use llvm static libraries then remove these options from your configure |