diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/llvm | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/llvm')
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 4554b752eb..4167080653 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" | |||
10 | 10 | ||
11 | DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" | 11 | DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" |
12 | 12 | ||
13 | COMPATIBLE_HOST_riscv64 = "null" | 13 | COMPATIBLE_HOST:riscv64 = "null" |
14 | COMPATIBLE_HOST_riscv32 = "null" | 14 | COMPATIBLE_HOST:riscv32 = "null" |
15 | 15 | ||
16 | RDEPENDS_${PN}_append_class-target = " ncurses-terminfo" | 16 | RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" |
17 | 17 | ||
18 | inherit cmake pkgconfig | 18 | inherit cmake pkgconfig |
19 | 19 | ||
@@ -62,8 +62,8 @@ def get_llvm_host_arch(bb, d): | |||
62 | # | 62 | # |
63 | LLVM_TARGETS ?= "AMDGPU;${@get_llvm_host_arch(bb, d)}" | 63 | LLVM_TARGETS ?= "AMDGPU;${@get_llvm_host_arch(bb, d)}" |
64 | 64 | ||
65 | ARM_INSTRUCTION_SET_armv5 = "arm" | 65 | ARM_INSTRUCTION_SET:armv5 = "arm" |
66 | ARM_INSTRUCTION_SET_armv4t = "arm" | 66 | ARM_INSTRUCTION_SET:armv4t = "arm" |
67 | 67 | ||
68 | EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ | 68 | EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ |
69 | -DLLVM_ENABLE_EXPENSIVE_CHECKS=OFF \ | 69 | -DLLVM_ENABLE_EXPENSIVE_CHECKS=OFF \ |
@@ -79,19 +79,19 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ | |||
79 | -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ | 79 | -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ |
80 | -G Ninja" | 80 | -G Ninja" |
81 | 81 | ||
82 | EXTRA_OECMAKE_append_class-target = "\ | 82 | EXTRA_OECMAKE:append:class-target = "\ |
83 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | 83 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ |
84 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ | 84 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ |
85 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ | 85 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ |
86 | " | 86 | " |
87 | 87 | ||
88 | EXTRA_OECMAKE_append_class-nativesdk = "\ | 88 | EXTRA_OECMAKE:append:class-nativesdk = "\ |
89 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | 89 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ |
90 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ | 90 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ |
91 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ | 91 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ |
92 | " | 92 | " |
93 | 93 | ||
94 | do_configure_prepend() { | 94 | do_configure:prepend() { |
95 | # Fix paths in llvm-config | 95 | # Fix paths in llvm-config |
96 | 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 | 96 | 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 |
97 | sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp | 97 | sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp |
@@ -99,7 +99,7 @@ do_configure_prepend() { | |||
99 | } | 99 | } |
100 | 100 | ||
101 | # patch out build host paths for reproducibility | 101 | # patch out build host paths for reproducibility |
102 | do_compile_prepend_class-target() { | 102 | do_compile:prepend:class-target() { |
103 | sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-config/BuildVariables.inc | 103 | sed -i -e "s,${WORKDIR},,g" ${B}/tools/llvm-config/BuildVariables.inc |
104 | } | 104 | } |
105 | 105 | ||
@@ -107,7 +107,7 @@ do_compile() { | |||
107 | ninja -v ${PARALLEL_MAKE} | 107 | ninja -v ${PARALLEL_MAKE} |
108 | } | 108 | } |
109 | 109 | ||
110 | do_compile_class-native() { | 110 | do_compile:class-native() { |
111 | ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen | 111 | ninja -v ${PARALLEL_MAKE} llvm-config llvm-tblgen |
112 | } | 112 | } |
113 | 113 | ||
@@ -142,7 +142,7 @@ do_install() { | |||
142 | rm -rf ${D}${libdir}/${LLVM_DIR}/libLTO.so | 142 | rm -rf ${D}${libdir}/${LLVM_DIR}/libLTO.so |
143 | } | 143 | } |
144 | 144 | ||
145 | do_install_class-native() { | 145 | do_install:class-native() { |
146 | install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} | 146 | install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} |
147 | install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} | 147 | install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} |
148 | install -D -m 0755 ${B}/lib/libLLVM-${MAJOR_VERSION}.so ${D}${libdir}/libLLVM-${MAJOR_VERSION}.so | 148 | install -D -m 0755 ${B}/lib/libLLVM-${MAJOR_VERSION}.so ${D}${libdir}/libLLVM-${MAJOR_VERSION}.so |
@@ -150,39 +150,39 @@ do_install_class-native() { | |||
150 | 150 | ||
151 | PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto" | 151 | PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto" |
152 | 152 | ||
153 | RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liboptremarks" | 153 | RRECOMMENDS:${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liboptremarks" |
154 | 154 | ||
155 | FILES_${PN}-bugpointpasses = "\ | 155 | FILES:${PN}-bugpointpasses = "\ |
156 | ${libdir}/${LLVM_DIR}/BugpointPasses.so \ | 156 | ${libdir}/${LLVM_DIR}/BugpointPasses.so \ |
157 | " | 157 | " |
158 | 158 | ||
159 | FILES_${PN}-libllvm = "\ | 159 | FILES:${PN}-libllvm = "\ |
160 | ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.so \ | 160 | ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.so \ |
161 | ${libdir}/libLLVM-${MAJOR_VERSION}.so \ | 161 | ${libdir}/libLLVM-${MAJOR_VERSION}.so \ |
162 | " | 162 | " |
163 | 163 | ||
164 | FILES_${PN}-liblto += "\ | 164 | FILES:${PN}-liblto += "\ |
165 | ${libdir}/${LLVM_DIR}/libLTO.so.* \ | 165 | ${libdir}/${LLVM_DIR}/libLTO.so.* \ |
166 | " | 166 | " |
167 | 167 | ||
168 | FILES_${PN}-liboptremarks += "\ | 168 | FILES:${PN}-liboptremarks += "\ |
169 | ${libdir}/${LLVM_DIR}/libRemarks.so.* \ | 169 | ${libdir}/${LLVM_DIR}/libRemarks.so.* \ |
170 | " | 170 | " |
171 | 171 | ||
172 | FILES_${PN}-llvmhello = "\ | 172 | FILES:${PN}-llvmhello = "\ |
173 | ${libdir}/${LLVM_DIR}/LLVMHello.so \ | 173 | ${libdir}/${LLVM_DIR}/LLVMHello.so \ |
174 | " | 174 | " |
175 | 175 | ||
176 | FILES_${PN}-dev += " \ | 176 | FILES:${PN}-dev += " \ |
177 | ${libdir}/${LLVM_DIR}/llvm-config \ | 177 | ${libdir}/${LLVM_DIR}/llvm-config \ |
178 | ${libdir}/${LLVM_DIR}/libRemarks.so \ | 178 | ${libdir}/${LLVM_DIR}/libRemarks.so \ |
179 | ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ | 179 | ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ |
180 | " | 180 | " |
181 | 181 | ||
182 | FILES_${PN}-staticdev += "\ | 182 | FILES:${PN}-staticdev += "\ |
183 | ${libdir}/${LLVM_DIR}/*.a \ | 183 | ${libdir}/${LLVM_DIR}/*.a \ |
184 | " | 184 | " |
185 | 185 | ||
186 | INSANE_SKIP_${PN}-libllvm += "dev-so" | 186 | INSANE_SKIP:${PN}-libllvm += "dev-so" |
187 | 187 | ||
188 | BBCLASSEXTEND = "native nativesdk" | 188 | BBCLASSEXTEND = "native nativesdk" |