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

llvm: Update to 6.0.1

Browse Source 
Drop upstreamed patch

(From OE-Core rev: b0783b713e0ad766797d20e0d1f3187effb08a71)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-08-15 21:12:00 -07:00
committed by Richard Purdie
parent 7204e57262
commit d4bc49d3d5
2 changed files with 2 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch
View File

@@ -1,41 +0,0 @@
From 7f7743ce233fcd735ec580c75270413493658aa6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 19 Apr 2018 18:08:31 -0700
Subject: [PATCH] Disable generating a native llvm-config
OpenEmbedded already builds this as part of llvm-native
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tools/llvm-config/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
index 25f99cec978..c45e9b642a8 100644
--- a/tools/llvm-config/CMakeLists.txt
+++ b/tools/llvm-config/CMakeLists.txt
@@ -63,19 +63,3 @@ endif()
# Add the dependency on the generation step.
add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABLES_OBJPATH})
-
-if(CMAKE_CROSSCOMPILING)
- set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config")
- set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE)
-
- add_custom_command(OUTPUT "${${project}_LLVM_CONFIG_EXE}"
- COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIGURATION>
- DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt
- WORKING_DIRECTORY ${LLVM_NATIVE_BUILD}
- COMMENT "Building native llvm-config..."
- USES_TERMINAL)
- add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_EXE})
- add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE)
-
- add_dependencies(llvm-config ${project}NativeLLVMConfig)
-endif(CMAKE_CROSSCOMPILING)
--
2.17.0

5
meta/recipes-devtools/llvm/llvm_git.bb
View File

@@ -19,14 +19,13 @@ PROVIDES += "llvm${PV}"
LLVM_RELEASE = "${PV}"
LLVM_DIR = "llvm${LLVM_RELEASE}"
SRCREV = "089d4c0c490687db6c75f1d074e99c4d42936a50"
SRCREV = "5136df4d089a086b70d452160ad5451861269498"
PV = "6.0"
BRANCH = "release_60"
PATCH_VERSION = "0"
PATCH_VERSION = "1"
SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \
file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
file://0002-llvm-allow-env-override-of-exe-path.patch \
file://0001-Disable-generating-a-native-llvm-config.patch \
"
UPSTREAM_CHECK_COMMITS = "1"
S = "${WORKDIR}/git"