diff options
| -rw-r--r-- | meta/classes/meson.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index aaf873cad2..115d1aedcb 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -89,7 +89,7 @@ ld = ${@meson_array('LD', d)} strip = ${@meson_array('STRIP', d)} readelf = ${@meson_array('READELF', d)} pkgconfig = 'pkg-config' -llvm-config = 'llvm-config8.0' +llvm-config = 'llvm-config8.0.0' [properties] needs_exe_wrapper = true diff --git a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch index 2970b0827b..1369bcf78c 100644 --- a/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch +++ b/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch @@ -51,7 +51,7 @@ index bec89fef98c..91b4d6e4c43 100644 ActiveObjRoot = LLVM_OBJ_ROOT; } else if (sys::fs::equivalent(CurrentExecPrefix, - Twine(LLVM_OBJ_ROOT) + "/bin")) { -+ Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0")) { ++ Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0.0")) { IsInDevelopmentTree = true; DevelopmentTreeLayout = CMakeBuildModeStyle; ActiveObjRoot = LLVM_OBJ_ROOT; @@ -63,12 +63,12 @@ index bec89fef98c..91b4d6e4c43 100644 + // llvm-config from within a target sysroot. + std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME"); + if (Multilibdir.empty()) { -+ Multilibdir = "/lib/llvm8.0" LLVM_LIBDIR_SUFFIX; ++ Multilibdir = "/lib/llvm8.0.0" LLVM_LIBDIR_SUFFIX; + } + if (IsInDevelopmentTree) { - ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; -+ ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include/llvm8.0"; ++ ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include/llvm8.0.0"; ActivePrefix = CurrentExecPrefix; // CMake organizes the products differently than a normal prefix style @@ -78,17 +78,17 @@ index bec89fef98c..91b4d6e4c43 100644 case CMakeStyle: - ActiveBinDir = ActiveObjRoot + "/bin"; - ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX; -+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0"; -+ ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX; ++ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0.0"; ++ ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0.0" + LLVM_LIBDIR_SUFFIX; ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; break; case CMakeBuildModeStyle: ActivePrefix = ActiveObjRoot; - ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; -+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0/" + build_mode; ++ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0.0/" + build_mode; ActiveLibDir = - ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; -+ ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; ++ ActiveObjRoot + "/lib/llvm8.0.0" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; break; } @@ -96,11 +96,11 @@ index bec89fef98c..91b4d6e4c43 100644 // We need to include files from both the source and object trees. ActiveIncludeOption = - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); -+ ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0"); ++ ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0.0"); } else { ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; -+ ActiveIncludeDir = ActivePrefix + "/include/llvm8.0"; ++ ActiveIncludeDir = ActivePrefix + "/include/llvm8.0.0"; SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); sys::fs::make_absolute(ActivePrefix, path); ActiveBinDir = path.str(); diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 54818d7e0d..ece74974b5 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -106,7 +106,7 @@ GALLIUMDRIVERS_append = ",virgl" # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -MESA_LLVM_RELEASE ?= "8.0" +MESA_LLVM_RELEASE ?= "8.0.0" PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" |