summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-15 21:12:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-16 22:40:28 +0100
commitd4bc49d3d5e6953e9dcb788dc256388771b786c5 (patch)
tree852bf680dc8d6429247597d9e9cc2ecc19c63f34
parent7204e57262c5dffe3e2c9a2e59c3f2e9e4e35514 (diff)
downloadpoky-d4bc49d3d5e6953e9dcb788dc256388771b786c5.tar.gz
llvm: Update to 6.0.1
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>
-rw-r--r--meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch41
-rw-r--r--meta/recipes-devtools/llvm/llvm_git.bb5
2 files changed, 2 insertions, 44 deletions
diff --git a/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch b/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch
deleted file mode 100644
index 2809e4c594..0000000000
--- a/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 7f7743ce233fcd735ec580c75270413493658aa6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 Apr 2018 18:08:31 -0700
4Subject: [PATCH] Disable generating a native llvm-config
5
6OpenEmbedded already builds this as part of llvm-native
7
8Upstream-Status: Inappropriate [OE-Specific]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 tools/llvm-config/CMakeLists.txt | 16 ----------------
13 1 file changed, 16 deletions(-)
14
15diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
16index 25f99cec978..c45e9b642a8 100644
17--- a/tools/llvm-config/CMakeLists.txt
18+++ b/tools/llvm-config/CMakeLists.txt
19@@ -63,19 +63,3 @@ endif()
20
21 # Add the dependency on the generation step.
22 add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABLES_OBJPATH})
23-
24-if(CMAKE_CROSSCOMPILING)
25- set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config")
26- set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE)
27-
28- add_custom_command(OUTPUT "${${project}_LLVM_CONFIG_EXE}"
29- COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIGURATION>
30- DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt
31- WORKING_DIRECTORY ${LLVM_NATIVE_BUILD}
32- COMMENT "Building native llvm-config..."
33- USES_TERMINAL)
34- add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_EXE})
35- add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE)
36-
37- add_dependencies(llvm-config ${project}NativeLLVMConfig)
38-endif(CMAKE_CROSSCOMPILING)
39--
402.17.0
41
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index cb3bba6fab..bb83012231 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,14 +19,13 @@ PROVIDES += "llvm${PV}"
19LLVM_RELEASE = "${PV}" 19LLVM_RELEASE = "${PV}"
20LLVM_DIR = "llvm${LLVM_RELEASE}" 20LLVM_DIR = "llvm${LLVM_RELEASE}"
21 21
22SRCREV = "089d4c0c490687db6c75f1d074e99c4d42936a50" 22SRCREV = "5136df4d089a086b70d452160ad5451861269498"
23PV = "6.0" 23PV = "6.0"
24BRANCH = "release_60" 24BRANCH = "release_60"
25PATCH_VERSION = "0" 25PATCH_VERSION = "1"
26SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \ 26SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \
27 file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ 27 file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
28 file://0002-llvm-allow-env-override-of-exe-path.patch \ 28 file://0002-llvm-allow-env-override-of-exe-path.patch \
29 file://0001-Disable-generating-a-native-llvm-config.patch \
30 " 29 "
31UPSTREAM_CHECK_COMMITS = "1" 30UPSTREAM_CHECK_COMMITS = "1"
32S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"