summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/go/go-cross.inc2
-rw-r--r--meta/recipes-devtools/go/go-crosssdk.inc2
-rw-r--r--meta/recipes-devtools/go/go-native.inc2
-rw-r--r--meta/recipes-devtools/go/go-target.inc2
-rw-r--r--meta/recipes-devtools/llvm/llvm_git.bb4
5 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc
index 234528ab98..dac0dfd137 100644
--- a/meta/recipes-devtools/go/go-cross.inc
+++ b/meta/recipes-devtools/go/go-cross.inc
@@ -15,7 +15,7 @@ export GOROOT_FINAL = "${libdir}/go"
15export CGO_ENABLED = "1" 15export CGO_ENABLED = "1"
16export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" 16export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
17export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" 17export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}"
18CC = "${@d.getVar('BUILD_CC', True).strip()}" 18CC = "${@d.getVar('BUILD_CC').strip()}"
19 19
20do_configure[noexec] = "1" 20do_configure[noexec] = "1"
21 21
diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc
index 471c75b3d5..f67e4b92a0 100644
--- a/meta/recipes-devtools/go/go-crosssdk.inc
+++ b/meta/recipes-devtools/go/go-crosssdk.inc
@@ -14,7 +14,7 @@ export CGO_ENABLED = "1"
14export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" 14export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}"
15export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" 15export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}"
16export GO_INSTALL = "cmd" 16export GO_INSTALL = "cmd"
17CC = "${@d.getVar('BUILD_CC', True).strip()}" 17CC = "${@d.getVar('BUILD_CC').strip()}"
18 18
19do_configure[noexec] = "1" 19do_configure[noexec] = "1"
20 20
diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc
index 66b845c633..95db1c2b7c 100644
--- a/meta/recipes-devtools/go/go-native.inc
+++ b/meta/recipes-devtools/go/go-native.inc
@@ -10,7 +10,7 @@ SRC_URI[bootstrap.sha256sum] = "9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e5
10 10
11export GOOS = "${BUILD_GOOS}" 11export GOOS = "${BUILD_GOOS}"
12export GOARCH = "${BUILD_GOARCH}" 12export GOARCH = "${BUILD_GOARCH}"
13CC = "${@d.getVar('BUILD_CC', True).strip()}" 13CC = "${@d.getVar('BUILD_CC').strip()}"
14 14
15export CGO_ENABLED = "1" 15export CGO_ENABLED = "1"
16 16
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc
index 6065c3c80d..b9689c03c4 100644
--- a/meta/recipes-devtools/go/go-target.inc
+++ b/meta/recipes-devtools/go/go-target.inc
@@ -25,7 +25,7 @@ do_configure[noexec] = "1"
25 25
26do_compile() { 26do_compile() {
27 export GOBIN="${B}/bin" 27 export GOBIN="${B}/bin"
28 export CC="${@d.getVar('BUILD_CC', True).strip()}" 28 export CC="${@d.getVar('BUILD_CC').strip()}"
29 rm -rf ${GOBIN} ${B}/pkg 29 rm -rf ${GOBIN} ${B}/pkg
30 mkdir ${GOBIN} 30 mkdir ${GOBIN}
31 31
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index 632178fd77..f06fa49ae5 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -32,7 +32,7 @@ S = "${WORKDIR}/git"
32LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" 32LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
33def get_llvm_arch(bb, d, arch_var): 33def get_llvm_arch(bb, d, arch_var):
34 import re 34 import re
35 a = d.getVar(arch_var, True) 35 a = d.getVar(arch_var)
36 if re.match('(i.86|athlon|x86.64)$', a): return 'X86' 36 if re.match('(i.86|athlon|x86.64)$', a): return 'X86'
37 elif re.match('arm$', a): return 'ARM' 37 elif re.match('arm$', a): return 'ARM'
38 elif re.match('armeb$', a): return 'ARM' 38 elif re.match('armeb$', a): return 'ARM'
@@ -174,7 +174,7 @@ python llvm_populate_packages() {
174 split_packages = do_split_packages(d, libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True) 174 split_packages = do_split_packages(d, libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True)
175 split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) 175 split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True)
176 if split_packages: 176 if split_packages:
177 pn = d.getVar('PN', True) 177 pn = d.getVar('PN')
178 d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) 178 d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages))
179 d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) 179 d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages))
180 d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) 180 d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages))