diff options
Diffstat (limited to 'meta/classes-recipe/go.bbclass')
-rw-r--r-- | meta/classes-recipe/go.bbclass | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index cc3564c36a..9146dd611e 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass | |||
@@ -48,8 +48,6 @@ GO_RPATH:class-native = "${@'-r ${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE | |||
48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" | 48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" |
49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" | 49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" |
50 | GO_LINKMODE ?= "" | 50 | GO_LINKMODE ?= "" |
51 | GO_LINKMODE:class-nativesdk = "--linkmode=external" | ||
52 | GO_LINKMODE:class-native = "--linkmode=external" | ||
53 | GO_EXTRA_LDFLAGS ?= "" | 51 | GO_EXTRA_LDFLAGS ?= "" |
54 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" | 52 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" |
55 | # Use system loader. If uninative is used, the uninative loader will be patched automatically | 53 | # Use system loader. If uninative is used, the uninative loader will be patched automatically |
@@ -82,19 +80,7 @@ export GOPROXY ??= "https://proxy.golang.org,direct" | |||
82 | export GOTMPDIR ?= "${WORKDIR}/build-tmp" | 80 | export GOTMPDIR ?= "${WORKDIR}/build-tmp" |
83 | GOTMPDIR[vardepvalue] = "" | 81 | GOTMPDIR[vardepvalue] = "" |
84 | 82 | ||
85 | python go_do_unpack() { | 83 | GO_SRCURI_DESTSUFFIX = "${@os.path.join(os.path.basename(d.getVar('S')), 'src', d.getVar('GO_IMPORT')) + '/'}" |
86 | src_uri = (d.getVar('SRC_URI') or "").split() | ||
87 | if len(src_uri) == 0: | ||
88 | return | ||
89 | |||
90 | fetcher = bb.fetch2.Fetch(src_uri, d) | ||
91 | for url in fetcher.urls: | ||
92 | if fetcher.ud[url].type == 'git': | ||
93 | if fetcher.ud[url].parm.get('destsuffix') is None: | ||
94 | s_dirname = os.path.basename(d.getVar('S')) | ||
95 | fetcher.ud[url].parm['destsuffix'] = os.path.join(s_dirname, 'src', d.getVar('GO_IMPORT')) + '/' | ||
96 | fetcher.unpack(d.getVar('WORKDIR')) | ||
97 | } | ||
98 | 84 | ||
99 | go_list_packages() { | 85 | go_list_packages() { |
100 | ${GO} list -f '{{.ImportPath}}' ${GOBUILDFLAGS} ${GO_INSTALL} | \ | 86 | ${GO} list -f '{{.ImportPath}}' ${GOBUILDFLAGS} ${GO_INSTALL} | \ |
@@ -153,7 +139,7 @@ go_stage_testdata() { | |||
153 | cd "$oldwd" | 139 | cd "$oldwd" |
154 | } | 140 | } |
155 | 141 | ||
156 | EXPORT_FUNCTIONS do_unpack do_configure do_compile do_install | 142 | EXPORT_FUNCTIONS do_configure do_compile do_install |
157 | 143 | ||
158 | FILES:${PN}-dev = "${libdir}/go/src" | 144 | FILES:${PN}-dev = "${libdir}/go/src" |
159 | FILES:${PN}-staticdev = "${libdir}/go/pkg" | 145 | FILES:${PN}-staticdev = "${libdir}/go/pkg" |