From e04d99bf3877b22ae3760829922a6e31f78295d1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 Oct 2018 20:46:12 -0700 Subject: [PATCH 1/3] rust-llvm: Fix build with OE-core master Disable libxml2 explicitly Disable building hosttools on target build Signed-off-by: Khem Raj --- recipes-devtools/rust/rust-llvm.inc | 46 +++++++++++++++++------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc index 370bb9d..53747bb 100644 --- a/recipes-devtools/rust/rust-llvm.inc +++ b/recipes-devtools/rust/rust-llvm.inc @@ -1,21 +1,28 @@ SUMMARY = "LLVM compiler framework (packaged with rust)" LICENSE = "NCSA" +SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch" + S = "${RUSTSRC}/src/llvm" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa" inherit cmake pythonnative +DEPENDS += "ninja-native rust-llvm-native" + +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv4t = "arm" + EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;Mips' \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_ENABLE_ZLIB=OFF \ + -DLLVM_ENABLE_LIBXML2=OFF \ -DLLVM_ENABLE_FFI=OFF \ -DLLVM_INSTALL_UTILS=ON \ - -DLLVM_BUILD_TOOLS=ON \ -DLLVM_BUILD_EXAMPLES=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_BUILD_TESTS=OFF \ @@ -23,6 +30,12 @@ EXTRA_OECMAKE = " \ -DLLVM_TARGET_ARCH=${TARGET_ARCH} \ -DCMAKE_INSTALL_PREFIX:PATH=${libdir}/llvm-rust \ " +EXTRA_OECMAKE_append_class-target = "\ + -DCMAKE_CROSSCOMPILING:BOOL=ON \ + -DLLVM_BUILD_TOOLS=OFF \ + -DLLVM_TABLEGEN=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-tblgen \ + -DLLVM_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config \ +" # The debug symbols are huge here (>2GB) so suppress them since they # provide almost no value. If you really need them then override this @@ -35,32 +48,27 @@ do_compile_prepend_class-target() { # Fix the hardcoded libdir in llvm-config sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp } +do_compile_class-native() { + ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen +} +do_install_class-native() { + install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${libdir}/llvm-rust/bin/llvm-tblgen + install -D -m 0755 ${B}/bin/llvm-config ${D}${libdir}/llvm-rust/bin/llvm-config +} do_install_append_class-target() { # Disable checks on the native tools, since these should came from the native recipe sed -i -e 's/\(.*APPEND.*_IMPORT_CHECK_FILES_FOR_.*{_IMPORT_PREFIX}\/bin\/.*\)/#\1/' ${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake } -SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_sysroot_preprocess" -SYSROOT_PREPROCESS_FUNCS_append_class-native = " llvm_native_sysroot_preprocess" - -llvm_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir} - cp ${B}/NATIVE/bin/llvm-config ${SYSROOT_DESTDIR}/${bindir} || bbfatal "missing llvm-config" - cp ${B}/NATIVE/bin/llvm-tblgen ${SYSROOT_DESTDIR}/${bindir} || bbfatal "missing llvm-tblgen" -} - -llvm_native_sysroot_preprocess() { - sysroot_stage_dir ${D}${STAGING_DIR_NATIVE}/usr/libexec ${SYSROOT_DESTDIR}${bindir} -} - PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liblto" # Add the extra locations to avoid the complaints about unpackaged files -FILES_${PN} += "${libdir}/libLLVM*.so" -FILES_${PN}-dev += "${datadir}/llvm" -FILES_${PN}-bugpointpasses = "${libdir}/BugpointPasses.so" -FILES_${PN}-llvmhello = "${libdir}/LLVMHello.so" -FILES_${PN}-liblto = "${libdir}/libLTO.so" +FILES_${PN}-bugpointpasses = "${libdir}/llvm-rust/lib/BugpointPasses.so" +FILES_${PN}-llvmhello = "${libdir}/llvm-rust/lib/LLVMHello.so" +FILES_${PN}-liblto = "${libdir}/llvm-rust/lib/libLTO.so.*" +FILES_${PN}-staticdev =+ "${libdir}/llvm-rust/*/*.a" +FILES_${PN} += "${libdir}/libLLVM*.so.* ${libdir}/llvm-rust/lib/*.so.* ${libdir}/llvm-rust/bin" +FILES_${PN}-dev += "${datadir}/llvm ${libdir}/llvm-rust/lib/*.so ${libdir}/llvm-rust/include ${libdir}/llvm-rust/share ${libdir}/llvm-rust/lib/cmake" BBCLASSEXTEND = "native" From b15ba05ea8169dee746201fa94fd74f4b1564264 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 9 Nov 2018 22:52:05 -0800 Subject: [PATCH 2/3] rust-llvm: Make llvm-config cross compile friendly Import patches from clang layer to ensure that llvm-config can be provided configs from environment Signed-off-by: Khem Raj --- recipes-devtools/rust/rust-llvm.inc | 18 +---- ...-llvm-allow-env-override-of-exe-path.patch | 70 +++++++++++++++++++ 2 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc index 53747bb..9ce4683 100644 --- a/recipes-devtools/rust/rust-llvm.inc +++ b/recipes-devtools/rust/rust-llvm.inc @@ -14,6 +14,9 @@ DEPENDS += "ninja-native rust-llvm-native" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv4t = "arm" +LLVM_RELEASE = "6.0" +LLVM_DIR = "llvm${LLVM_RELEASE}" + EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;Mips' \ @@ -41,21 +44,6 @@ EXTRA_OECMAKE_append_class-target = "\ # provide almost no value. If you really need them then override this INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -do_compile_prepend_class-target() { - # Fix paths in llvm-config - sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp - - # Fix the hardcoded libdir in llvm-config - sed -i 's:/lib\>:/${baselib}:g' ${S}/tools/llvm-config/llvm-config.cpp -} -do_compile_class-native() { - ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen -} -do_install_class-native() { - install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${libdir}/llvm-rust/bin/llvm-tblgen - install -D -m 0755 ${B}/bin/llvm-config ${D}${libdir}/llvm-rust/bin/llvm-config -} - do_install_append_class-target() { # Disable checks on the native tools, since these should came from the native recipe sed -i -e 's/\(.*APPEND.*_IMPORT_CHECK_FILES_FOR_.*{_IMPORT_PREFIX}\/bin\/.*\)/#\1/' ${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake diff --git a/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch new file mode 100644 index 0000000..70bb212 --- /dev/null +++ b/recipes-devtools/rust/rust-llvm/0002-llvm-allow-env-override-of-exe-path.patch @@ -0,0 +1,70 @@ +From aeccf16eaccdd80e4d5ecaa51673ce4b2bac1130 Mon Sep 17 00:00:00 2001 +From: Martin Kelly +Date: Fri, 19 May 2017 00:22:57 -0700 +Subject: [PATCH 2/2] llvm: allow env override of exe path + +When using a native llvm-config from inside a sysroot, we need llvm-config to +return the libraries, include directories, etc. from inside the sysroot rather +than from the native sysroot. Thus provide an env override for calling +llvm-config from a target sysroot. + +To let it work in multilib environment, we need to provide a knob to supply +multilib dirname as well + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Martin Kelly +Signed-off-by: Khem Raj +--- + tools/llvm-config/llvm-config.cpp | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +Index: llvm/tools/llvm-config/llvm-config.cpp +=================================================================== +--- llvm.orig/tools/llvm-config/llvm-config.cpp ++++ llvm/tools/llvm-config/llvm-config.cpp +@@ -225,6 +225,13 @@ Typical components:\n\ + + /// \brief Compute the path to the main executable. + std::string GetExecutablePath(const char *Argv0) { ++ // Hack for Yocto: we need to override the root path when we are using ++ // llvm-config from within a target sysroot. ++ const char *Sysroot = std::getenv("YOCTO_ALTERNATE_EXE_PATH"); ++ if (Sysroot != nullptr) { ++ return Sysroot; ++ } ++ + // This just needs to be some symbol in the binary; C++ doesn't + // allow taking the address of ::main however. + void *P = (void *)(intptr_t)GetExecutablePath; +@@ -306,12 +313,21 @@ int main(int argc, char **argv) { + std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir, + ActiveCMakeDir; + std::string ActiveIncludeOption; ++ // Hack for Yocto: we need to override the multilib path when we are using ++ // llvm-config from within a target sysroot. ++ std::string Multilibdir; ++ if (std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME") != nullptr) ++ Multilibdir = std::getenv("YOCTO_ALTERNATE_MULTILIB_NAME"); ++ else ++ Multilibdir = "/lib" LLVM_LIBDIR_SUFFIX; ++ + if (IsInDevelopmentTree) { + ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include"; + ActivePrefix = CurrentExecPrefix; + + // CMake organizes the products differently than a normal prefix style + // layout. ++ + switch (DevelopmentTreeLayout) { + case CMakeStyle: + ActiveBinDir = ActiveObjRoot + "/bin"; +@@ -336,7 +352,7 @@ int main(int argc, char **argv) { + SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); + sys::fs::make_absolute(ActivePrefix, path); + ActiveBinDir = path.str(); +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ ActiveLibDir = ActivePrefix + Multilibdir; + ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } From 446d28d6e1ff196eec3a1b25eb70c6ea51701a68 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 9 Nov 2018 22:53:49 -0800 Subject: [PATCH 3/3] rust: Use llvm-rust-native and env variables to configure llvm-config Signed-off-by: Khem Raj --- recipes-devtools/rust/rust.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/rust/rust.inc b/recipes-devtools/rust/rust.inc index d4981a9..b97e7e9 100644 --- a/recipes-devtools/rust/rust.inc +++ b/recipes-devtools/rust/rust.inc @@ -7,12 +7,16 @@ inherit rust inherit cargo_common DEPENDS += "file-native python-native" +DEPENDS_append_class-native = " rust-llvm-native" # We generate local targets, and need to be able to locate them export RUST_TARGET_PATH="${WORKDIR}/targets/" export FORCE_CRATE_HASH="${BB_TASKHASH}" +export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" +export YOCTO_ALTERNATE_MULTILIB_NAME = "/${BASELIB}" + # We can't use RUST_BUILD_SYS here because that may be "musl" if # TCLIBC="musl". Snapshots are always -unknown-linux-gnu SNAPSHOT_BUILD_SYS = "${BUILD_ARCH}-unknown-linux-gnu" @@ -345,7 +349,7 @@ python do_configure() { target_section = "target.{}".format(d.getVar('TARGET_SYS', True)) config.add_section(target_section) - llvm_config = d.expand("${STAGING_DIR_NATIVE}${libdir_native}/llvm-rust/bin/llvm-config") + llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}") config.set(target_section, "llvm-config", e(llvm_config)) config.set(target_section, "cxx", e(d.expand("${RUST_TARGET_CXX}")))