From: Matt Madison <matt@madison.systems> Enable cross-canadian builds of the Go toolchain. This requires an additional patch to the Go source to allow us to use the native GOTOOLDIR during the bootstrap phase.
Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Otavio Salvador <ota...@ossystems.com.br> --- Changes in v8: - Fix patch header Changes in v7: - Add patch header Changes in v6: - new patch meta/recipes-devtools/go/go-1.8.inc | 1 + .../go/go-1.8/set-gotooldir-during-bootstrap.patch | 22 ++++++++ meta/recipes-devtools/go/go-cross-canadian.inc | 64 ++++++++++++++++++++++ meta/recipes-devtools/go/go-cross-canadian_1.8.bb | 2 + 4 files changed, 89 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.8/set-gotooldir-during-bootstrap.patch create mode 100644 meta/recipes-devtools/go/go-cross-canadian.inc create mode 100644 meta/recipes-devtools/go/go-cross-canadian_1.8.bb diff --git a/meta/recipes-devtools/go/go-1.8.inc b/meta/recipes-devtools/go/go-1.8.inc index 2920d06f60..141c0994c3 100644 --- a/meta/recipes-devtools/go/go-1.8.inc +++ b/meta/recipes-devtools/go/go-1.8.inc @@ -15,6 +15,7 @@ SRC_URI += "\ file://split-host-and-target-build.patch \ file://gotooldir.patch \ file://make-goroot-precious.patch \ + file://set-gotooldir-during-bootstrap.patch \ " SRC_URI[main.md5sum] = "64e9380e07bba907e26a00cf5fcbe77e" SRC_URI[main.sha256sum] = "5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6" diff --git a/meta/recipes-devtools/go/go-1.8/set-gotooldir-during-bootstrap.patch b/meta/recipes-devtools/go/go-1.8/set-gotooldir-during-bootstrap.patch new file mode 100644 index 0000000000..4b5e424d96 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.8/set-gotooldir-during-bootstrap.patch @@ -0,0 +1,22 @@ +Set GOTOOLDIR during bootstrap + +Signed-off-by: Matt Madison <matt@madison.systems> +Upstream-Status: Pending + +Index: go/src/make.bash +=================================================================== +--- go.orig/src/make.bash ++++ go/src/make.bash +@@ -172,10 +172,11 @@ if [ "$do_host_build" = "yes" ]; then + mv cmd/dist/dist "$GOTOOLDIR"/dist + echo + ++ GOTOOLDIR_BOOTSTRAP="${GOTOOLDIR_BOOTSTRAP:-$GOTOOLDIR}" + echo "##### Building packages and commands for host, $GOHOSTOS/$GOHOSTARCH." + # CC_FOR_TARGET is recorded as the default compiler for the go tool. When building for the host, however, + # use the host compiler, CC, from `cmd/dist/dist env` instead. +- CC=$CC GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \ ++ CC=$CC GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH GOTOOLDIR="$GOTOOLDIR_BOOTSTRAP" \ + "$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd + echo + fi diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc new file mode 100644 index 0000000000..f0315d558a --- /dev/null +++ b/meta/recipes-devtools/go/go-cross-canadian.inc @@ -0,0 +1,64 @@ +inherit cross-canadian + +DEPENDS = "go-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc virtual/nativesdk-${HOST_PREFIX}compilerlibs" +PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" + +export GOHOSTOS = "${BUILD_GOOS}" +export GOHOSTARCH = "${BUILD_GOARCH}" +export GOOS = "${HOST_GOOS}" +export GOARCH = "${HOST_GOARCH}" +export GOARM = "${HOST_GOARM}" +export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" +export GOTOOLDIR_BOOTSTRAP = "${GOROOT_BOOTSTRAP}/pkg/tool/${BUILD_GOTUPLE}" +export GOROOT_FINAL = "${libdir}/go" +export CGO_ENABLED = "1" +export CC_FOR_TARGET = "${HOST_CC}" +export CXX_FOR_TARGET = "${HOST_CXX}" +CC = "${@d.getVar('BUILD_CC', True).strip()}" +export GO_LDFLAGS = '-linkmode external -extld ${HOST_PREFIX}gcc -extldflags "${TOOLCHAIN_OPTIONS} ${LDFLAGS}"' + +do_configure[noexec] = "1" + +do_compile() { + export GOBIN="${B}/bin" + rm -rf ${GOBIN} ${B}/pkg + mkdir ${GOBIN} + cd src + ./make.bash --host-only --no-banner + cd ${B} +} + + +make_wrapper() { + rm -f ${D}${bindir}/$2 + cat <<END >${D}${bindir}/$2 +#!/bin/bash +here=\`dirname \$0\` +native_goroot=\`readlink -f \$here/../../lib/${TARGET_SYS}/go\` +export GOARCH="${TARGET_GOARCH}" +export GOOS="${TARGET_GOOS}" +export GOARM="\${GOARM:-${TARGET_GOARM}}" +export GOTOOLDIR="\$native_goroot/pkg/tool/${HOST_GOTUPLE}" +export GOROOT="\${GOROOT:-\$OECORE_TARGET_SYSROOT/${target_libdir}/go}" +\$here/../../lib/${TARGET_SYS}/go/bin/$1 "\$@" +END + chmod +x ${D}${bindir}/$2 +} + +do_install() { + install -d ${D}${libdir}/go + cp --preserve=mode,timestamps -R ${B}/pkg ${D}${libdir}/go/ + install -d ${D}${libdir}/go/src + (cd ${S}/src; for d in *; do \ + [ -d $d ] && cp --preserve=mode,timestamps -R ${S}/src/$d ${D}${libdir}/go/src/; \ + done) + install -d ${D}${bindir} ${D}${libdir}/go/bin + for f in ${B}/bin/* + do + base=`basename $f` + install -m755 $f ${D}${libdir}/go/bin + make_wrapper $base ${TARGET_PREFIX}$base + done +} + +FILES_${PN}-staticdev = "${libdir}/go/pkg" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.8.bb b/meta/recipes-devtools/go/go-cross-canadian_1.8.bb new file mode 100644 index 0000000000..7ac9449e47 --- /dev/null +++ b/meta/recipes-devtools/go/go-cross-canadian_1.8.bb @@ -0,0 +1,2 @@ +require go-cross-canadian.inc +require go-${PV}.inc -- 2.14.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core