summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/go
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/go
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-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/go')
-rw-r--r--meta/recipes-devtools/go/go-1.16.5.inc2
-rw-r--r--meta/recipes-devtools/go/go-common.inc2
-rw-r--r--meta/recipes-devtools/go/go-native_1.16.5.bb2
-rw-r--r--meta/recipes-devtools/go/go-runtime.inc14
-rw-r--r--meta/recipes-devtools/go/go-target.inc12
-rw-r--r--meta/recipes-devtools/go/go_1.16.5.bb2
6 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-devtools/go/go-1.16.5.inc b/meta/recipes-devtools/go/go-1.16.5.inc
index bd928e44f8..545aa0c828 100644
--- a/meta/recipes-devtools/go/go-1.16.5.inc
+++ b/meta/recipes-devtools/go/go-1.16.5.inc
@@ -2,7 +2,7 @@ require go-common.inc
2 2
3GO_BASEVERSION = "1.16" 3GO_BASEVERSION = "1.16"
4PV = "1.16.5" 4PV = "1.16.5"
5FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" 5FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
6 6
7LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
8 8
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index 39a681a712..dfccebdb83 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -37,6 +37,6 @@ export GO386 ?= "${TARGET_GO386}"
37export GOMIPS ?= "${TARGET_GOMIPS}" 37export GOMIPS ?= "${TARGET_GOMIPS}"
38export GOROOT_FINAL ?= "${libdir}/go" 38export GOROOT_FINAL ?= "${libdir}/go"
39 39
40do_compile_prepend() { 40do_compile:prepend() {
41 BUILD_CC=${BUILD_CC} 41 BUILD_CC=${BUILD_CC}
42} 42}
diff --git a/meta/recipes-devtools/go/go-native_1.16.5.bb b/meta/recipes-devtools/go/go-native_1.16.5.bb
index f14892cdb0..ffe4ef3523 100644
--- a/meta/recipes-devtools/go/go-native_1.16.5.bb
+++ b/meta/recipes-devtools/go/go-native_1.16.5.bb
@@ -5,7 +5,7 @@ require go-${PV}.inc
5 5
6inherit native 6inherit native
7 7
8SRC_URI_append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4" 8SRC_URI:append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4"
9SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52" 9SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
10 10
11export GOOS = "${BUILD_GOOS}" 11export GOOS = "${BUILD_GOOS}"
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc
index 21179a83a0..617e6b5414 100644
--- a/meta/recipes-devtools/go/go-runtime.inc
+++ b/meta/recipes-devtools/go/go-runtime.inc
@@ -1,5 +1,5 @@
1DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" 1DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native"
2DEPENDS_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" 2DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk"
3PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" 3PROVIDES = "virtual/${TARGET_PREFIX}go-runtime"
4 4
5export CGO_CFLAGS = "${CFLAGS}" 5export CGO_CFLAGS = "${CFLAGS}"
@@ -15,7 +15,7 @@ do_configure() {
15 : 15 :
16} 16}
17 17
18do_configure_libc-musl() { 18do_configure:libc-musl() {
19 rm -f ${S}/src/runtime/race/*.syso 19 rm -f ${S}/src/runtime/race/*.syso
20} 20}
21 21
@@ -55,9 +55,9 @@ do_install() {
55 55
56} 56}
57 57
58ALLOW_EMPTY_${PN} = "1" 58ALLOW_EMPTY:${PN} = "1"
59FILES_${PN} = "${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*${SOLIBSDEV}" 59FILES:${PN} = "${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*${SOLIBSDEV}"
60FILES_${PN}-dev = "${libdir}/go/src ${libdir}/go/pkg/include \ 60FILES:${PN}-dev = "${libdir}/go/src ${libdir}/go/pkg/include \
61 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*.shlibname \ 61 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*.shlibname \
62 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*.shlibname \ 62 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*.shlibname \
63 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*.shlibname \ 63 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*.shlibname \
@@ -73,12 +73,12 @@ FILES_${PN}-dev = "${libdir}/go/src ${libdir}/go/pkg/include \
73 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*/*/*/*.a \ 73 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*/*/*/*.a \
74 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*/*/*/*/*.a \ 74 ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink/*/*/*/*/*/*/*.a \
75" 75"
76FILES_${PN}-staticdev = "${libdir}/go/pkg/${TARGET_GOTUPLE}" 76FILES:${PN}-staticdev = "${libdir}/go/pkg/${TARGET_GOTUPLE}"
77 77
78# Go sources include some scripts and pre-built binaries for 78# Go sources include some scripts and pre-built binaries for
79# multiple architectures. The static .a files for dynamically-linked 79# multiple architectures. The static .a files for dynamically-linked
80# runtime are also required in -dev. 80# runtime are also required in -dev.
81INSANE_SKIP_${PN}-dev = "staticdev file-rdeps arch" 81INSANE_SKIP:${PN}-dev = "staticdev file-rdeps arch"
82 82
83INHIBIT_PACKAGE_STRIP = "1" 83INHIBIT_PACKAGE_STRIP = "1"
84INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 84INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc
index 8e44247031..47b4411d54 100644
--- a/meta/recipes-devtools/go/go-target.inc
+++ b/meta/recipes-devtools/go/go-target.inc
@@ -1,12 +1,12 @@
1DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" 1DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native"
2DEPENDS_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" 2DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native"
3 3
4export GOCACHE = "${B}/.cache" 4export GOCACHE = "${B}/.cache"
5GO_LDFLAGS = "" 5GO_LDFLAGS = ""
6GO_LDFLAGS_class-nativesdk = "-linkmode external" 6GO_LDFLAGS:class-nativesdk = "-linkmode external"
7export GO_LDFLAGS 7export GO_LDFLAGS
8 8
9CC_append_class-nativesdk = " ${SECURITY_NOPIE_CFLAGS}" 9CC:append:class-nativesdk = " ${SECURITY_NOPIE_CFLAGS}"
10 10
11do_configure[noexec] = "1" 11do_configure[noexec] = "1"
12 12
@@ -38,8 +38,8 @@ do_install() {
38} 38}
39 39
40PACKAGES = "${PN} ${PN}-dev" 40PACKAGES = "${PN} ${PN}-dev"
41FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" 41FILES:${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}"
42RDEPENDS_${PN} = "go-runtime" 42RDEPENDS:${PN} = "go-runtime"
43INSANE_SKIP_${PN} = "ldflags" 43INSANE_SKIP:${PN} = "ldflags"
44 44
45BBCLASSEXTEND = "nativesdk" 45BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/go/go_1.16.5.bb b/meta/recipes-devtools/go/go_1.16.5.bb
index 4e9e0ebec8..34dc89bb0c 100644
--- a/meta/recipes-devtools/go/go_1.16.5.bb
+++ b/meta/recipes-devtools/go/go_1.16.5.bb
@@ -12,6 +12,6 @@ export CXX_FOR_TARGET = "g++"
12# variants. 12# variants.
13python() { 13python() {
14 if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): 14 if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True):
15 d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") 15 d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel")
16} 16}
17 17