mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

llvm: fix more places where '8.0' version of llvm was hardcoded

Browse Source 
So that it says '8.0.0' to reflect the recent PV change.

(From OE-Core rev: 3b4049157a72bcd984f93405a75946a39c045f2d)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-03-28 15:04:23 +01:00
committed by Richard Purdie
parent d587e20be5
commit 259e9a11e1
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/meson.bbclass
View File

@@ -89,7 +89,7 @@ ld = ${@meson_array('LD', d)}
strip = ${@meson_array('STRIP', d)} strip = ${@meson_array('STRIP', d)}
readelf = ${@meson_array('READELF', d)} readelf = ${@meson_array('READELF', d)}
pkgconfig = 'pkg-config' pkgconfig = 'pkg-config'
llvm-config = 'llvm-config8.0' llvm-config = 'llvm-config8.0.0'
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true

18
meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
View File

@@ -51,7 +51,7 @@ index bec89fef98c..91b4d6e4c43 100644
ActiveObjRoot = LLVM_OBJ_ROOT; ActiveObjRoot = LLVM_OBJ_ROOT;
} else if (sys::fs::equivalent(CurrentExecPrefix, } else if (sys::fs::equivalent(CurrentExecPrefix,
- Twine(LLVM_OBJ_ROOT) + "/bin")) { - Twine(LLVM_OBJ_ROOT) + "/bin")) {
+ Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0")) { + Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0.0")) {
IsInDevelopmentTree = true; IsInDevelopmentTree = true;
DevelopmentTreeLayout = CMakeBuildModeStyle; DevelopmentTreeLayout = CMakeBuildModeStyle;
ActiveObjRoot = LLVM_OBJ_ROOT; ActiveObjRoot = LLVM_OBJ_ROOT;
@@ -63,12 +63,12 @@ index bec89fef98c..91b4d6e4c43 100644
+ // llvm-config from within a target sysroot. + // llvm-config from within a target sysroot.
+ std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME"); + std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME");
+ if (Multilibdir.empty()) { + if (Multilibdir.empty()) {
+ Multilibdir = "/lib/llvm8.0" LLVM_LIBDIR_SUFFIX; + Multilibdir = "/lib/llvm8.0.0" LLVM_LIBDIR_SUFFIX;
+ } + }
+ +
if (IsInDevelopmentTree) { if (IsInDevelopmentTree) {
- ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; - 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; ActivePrefix = CurrentExecPrefix;
// CMake organizes the products differently than a normal prefix style // CMake organizes the products differently than a normal prefix style
@@ -78,17 +78,17 @@ index bec89fef98c..91b4d6e4c43 100644
case CMakeStyle: case CMakeStyle:
- ActiveBinDir = ActiveObjRoot + "/bin"; - ActiveBinDir = ActiveObjRoot + "/bin";
- ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX; - ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX;
+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0"; + ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0.0";
+ ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX; + ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0.0" + LLVM_LIBDIR_SUFFIX;
ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
break; break;
case CMakeBuildModeStyle: case CMakeBuildModeStyle:
ActivePrefix = ActiveObjRoot; ActivePrefix = ActiveObjRoot;
- ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; - ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode;
+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0/" + build_mode; + ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0.0/" + build_mode;
ActiveLibDir = ActiveLibDir =
- ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; - 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"; ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
break; break;
} }
@@ -96,11 +96,11 @@ index bec89fef98c..91b4d6e4c43 100644
// We need to include files from both the source and object trees. // We need to include files from both the source and object trees.
ActiveIncludeOption = ActiveIncludeOption =
- ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");
+ ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0"); + ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0.0");
} else { } else {
ActivePrefix = CurrentExecPrefix; ActivePrefix = CurrentExecPrefix;
- ActiveIncludeDir = ActivePrefix + "/include"; - ActiveIncludeDir = ActivePrefix + "/include";
+ ActiveIncludeDir = ActivePrefix + "/include/llvm8.0"; + ActiveIncludeDir = ActivePrefix + "/include/llvm8.0.0";
SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR));
sys::fs::make_absolute(ActivePrefix, path); sys::fs::make_absolute(ActivePrefix, path);
ActiveBinDir = path.str(); ActiveBinDir = path.str();

2
meta/recipes-graphics/mesa/mesa.inc
View File

@@ -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 # 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" 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 \ PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"