diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
commit | a75bff085ba9443315222231c42692745e5781e9 (patch) | |
tree | e1aa422babae0dffc866af076a0274ff26c2c4b2 /poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch | |
parent | 3e809d0d5cf96c18c5720d1b6b3b53e9f4c0cfae (diff) | |
parent | 6d4bcf0a75b2a6055055c9ad8ed6b93599082385 (diff) | |
download | openbmc-a75bff085ba9443315222231c42692745e5781e9.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch')
-rw-r--r-- | poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch index 5e735ca10..96edc2172 100644 --- a/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch +++ b/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch @@ -1,7 +1,7 @@ -From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001 +From ce7b9ff6517fda089f296b2af2c1c49604872514 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <otavio@ossystems.com.br> Date: Tue, 5 Jun 2018 11:11:10 -0300 -Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases +Subject: [PATCH 3/4] Properly get LLVM version when using LLVM Git releases Organization: O.S. Systems Software LTDA. $ llvm-config-host --version @@ -13,15 +13,16 @@ doing Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 916d0bd207..dd172f1ebe 100644 +index 1816a4cd475..13fed9daf59 100644 --- a/configure.ac +++ b/configure.ac -@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() { +@@ -1124,7 +1124,7 @@ strip_unwanted_llvm_flags() { llvm_set_environment_variables() { if test "x$LLVM_CONFIG" != xno; then @@ -30,7 +31,7 @@ index 916d0bd207..dd172f1ebe 100644 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` -@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() { +@@ -2870,7 +2870,7 @@ detect_old_buggy_llvm() { dnl ourselves. dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, @@ -40,5 +41,5 @@ index 916d0bd207..dd172f1ebe 100644 if test "x$llvm_have_one_so" = xyes; then -- -2.18.0 +2.21.0 |