summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/meson.bbclass2
-rw-r--r--meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch18
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
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)}
89strip = ${@meson_array('STRIP', d)} 89strip = ${@meson_array('STRIP', d)}
90readelf = ${@meson_array('READELF', d)} 90readelf = ${@meson_array('READELF', d)}
91pkgconfig = 'pkg-config' 91pkgconfig = 'pkg-config'
92llvm-config = 'llvm-config8.0' 92llvm-config = 'llvm-config8.0.0'
93 93
94[properties] 94[properties]
95needs_exe_wrapper = true 95needs_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
51 ActiveObjRoot = LLVM_OBJ_ROOT; 51 ActiveObjRoot = LLVM_OBJ_ROOT;
52 } else if (sys::fs::equivalent(CurrentExecPrefix, 52 } else if (sys::fs::equivalent(CurrentExecPrefix,
53- Twine(LLVM_OBJ_ROOT) + "/bin")) { 53- Twine(LLVM_OBJ_ROOT) + "/bin")) {
54+ Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0")) { 54+ Twine(LLVM_OBJ_ROOT) + "/bin/llvm8.0.0")) {
55 IsInDevelopmentTree = true; 55 IsInDevelopmentTree = true;
56 DevelopmentTreeLayout = CMakeBuildModeStyle; 56 DevelopmentTreeLayout = CMakeBuildModeStyle;
57 ActiveObjRoot = LLVM_OBJ_ROOT; 57 ActiveObjRoot = LLVM_OBJ_ROOT;
@@ -63,12 +63,12 @@ index bec89fef98c..91b4d6e4c43 100644
63+ // llvm-config from within a target sysroot. 63+ // llvm-config from within a target sysroot.
64+ std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME"); 64+ std::string Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME");
65+ if (Multilibdir.empty()) { 65+ if (Multilibdir.empty()) {
66+ Multilibdir = "/lib/llvm8.0" LLVM_LIBDIR_SUFFIX; 66+ Multilibdir = "/lib/llvm8.0.0" LLVM_LIBDIR_SUFFIX;
67+ } 67+ }
68+ 68+
69 if (IsInDevelopmentTree) { 69 if (IsInDevelopmentTree) {
70- ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; 70- ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include";
71+ ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include/llvm8.0"; 71+ ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include/llvm8.0.0";
72 ActivePrefix = CurrentExecPrefix; 72 ActivePrefix = CurrentExecPrefix;
73 73
74 // CMake organizes the products differently than a normal prefix style 74 // CMake organizes the products differently than a normal prefix style
@@ -78,17 +78,17 @@ index bec89fef98c..91b4d6e4c43 100644
78 case CMakeStyle: 78 case CMakeStyle:
79- ActiveBinDir = ActiveObjRoot + "/bin"; 79- ActiveBinDir = ActiveObjRoot + "/bin";
80- ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX; 80- ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX;
81+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0"; 81+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0.0";
82+ ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX; 82+ ActiveLibDir = ActiveObjRoot + "/lib/llvm8.0.0" + LLVM_LIBDIR_SUFFIX;
83 ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; 83 ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
84 break; 84 break;
85 case CMakeBuildModeStyle: 85 case CMakeBuildModeStyle:
86 ActivePrefix = ActiveObjRoot; 86 ActivePrefix = ActiveObjRoot;
87- ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; 87- ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode;
88+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0/" + build_mode; 88+ ActiveBinDir = ActiveObjRoot + "/bin/llvm8.0.0/" + build_mode;
89 ActiveLibDir = 89 ActiveLibDir =
90- ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; 90- ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX + "/" + build_mode;
91+ ActiveObjRoot + "/lib/llvm8.0" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; 91+ ActiveObjRoot + "/lib/llvm8.0.0" + LLVM_LIBDIR_SUFFIX + "/" + build_mode;
92 ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; 92 ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
93 break; 93 break;
94 } 94 }
@@ -96,11 +96,11 @@ index bec89fef98c..91b4d6e4c43 100644
96 // We need to include files from both the source and object trees. 96 // We need to include files from both the source and object trees.
97 ActiveIncludeOption = 97 ActiveIncludeOption =
98- ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); 98- ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");
99+ ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0"); 99+ ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include/llvm8.0.0");
100 } else { 100 } else {
101 ActivePrefix = CurrentExecPrefix; 101 ActivePrefix = CurrentExecPrefix;
102- ActiveIncludeDir = ActivePrefix + "/include"; 102- ActiveIncludeDir = ActivePrefix + "/include";
103+ ActiveIncludeDir = ActivePrefix + "/include/llvm8.0"; 103+ ActiveIncludeDir = ActivePrefix + "/include/llvm8.0.0";
104 SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); 104 SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR));
105 sys::fs::make_absolute(ActivePrefix, path); 105 sys::fs::make_absolute(ActivePrefix, path);
106 ActiveBinDir = path.str(); 106 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"
106 106
107# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 107# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
108PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 108PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
109MESA_LLVM_RELEASE ?= "8.0" 109MESA_LLVM_RELEASE ?= "8.0.0"
110PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ 110PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
111 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 111 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
112export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" 112export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"