From 780aa334f8614c80ce5b9cb77b0cea2fcd482614 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Tue, 12 Sep 2017 09:50:26 -0300 Subject: go: rename go.inc -> go-target.inc to make it clearer that it is only used for building the toolchain for the target. Signed-off-by: Matt Madison Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-devtools/go/go-target.inc | 51 ++++++++++++++++++++++++++++++++++ meta/recipes-devtools/go/go.inc | 51 ---------------------------------- meta/recipes-devtools/go/go_1.8.bb | 2 +- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 meta/recipes-devtools/go/go-target.inc delete mode 100644 meta/recipes-devtools/go/go.inc diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc new file mode 100644 index 0000000000..5984a60c28 --- /dev/null +++ b/meta/recipes-devtools/go/go-target.inc @@ -0,0 +1,51 @@ +inherit goarch +DEPENDS = "virtual/${TARGET_PREFIX}go go-native" + +export GOHOSTOS = "${BUILD_GOOS}" +export GOHOSTARCH = "${BUILD_GOARCH}" +export GOOS = "${TARGET_GOOS}" +export GOARCH = "${TARGET_GOARCH}" +export GOARM = "${TARGET_GOARM}" +export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" +export GOROOT_FINAL = "${libdir}/go" +export CGO_ENABLED = "1" +export CC_FOR_TARGET = "${CC}" +export CXX_FOR_TARGET = "${CXX}" +export GO_TARGET_INSTALL = "cmd" +export GO_FLAGS = "-a" + +do_configure[noexec] = "1" + +do_compile() { + export GOBIN="${B}/bin" + export CC="${@d.getVar('BUILD_CC', True).strip()}" + rm -rf ${GOBIN} ${B}/pkg + mkdir ${GOBIN} + + export TMPDIR=${WORKDIR}/build-tmp + mkdir -p ${WORKDIR}/build-tmp + + cd src + ./make.bash + cd ${B} +} + +do_install() { + install -d ${D}${libdir}/go/pkg/tool + cp --preserve=mode,timestamps -R ${B}/pkg/tool/${TARGET_GOTUPLE} ${D}${libdir}/go/pkg/tool/ + install -d ${D}${libdir}/go/src + cp --preserve=mode,timestamps -R ${S}/src/cmd ${D}${libdir}/go/src/ + install -d ${D}${libdir}/go/bin + install -d ${D}${bindir} + for f in ${B}/${GO_BUILD_BINDIR}/*; do + name=`basename $f` + install -m 0755 $f ${D}${libdir}/go/bin/ + ln -sf ../${BASELIB}/go/bin/$name ${D}${bindir}/ + done +} + +PACKAGES = "${PN} ${PN}-dev" +FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" +FILES_${PN}-dev = "${libdir}/go" +RDEPENDS_${PN}-dev = "perl bash" +INSANE_SKIP_${PN} = "ldflags" diff --git a/meta/recipes-devtools/go/go.inc b/meta/recipes-devtools/go/go.inc deleted file mode 100644 index 5984a60c28..0000000000 --- a/meta/recipes-devtools/go/go.inc +++ /dev/null @@ -1,51 +0,0 @@ -inherit goarch -DEPENDS = "virtual/${TARGET_PREFIX}go go-native" - -export GOHOSTOS = "${BUILD_GOOS}" -export GOHOSTARCH = "${BUILD_GOARCH}" -export GOOS = "${TARGET_GOOS}" -export GOARCH = "${TARGET_GOARCH}" -export GOARM = "${TARGET_GOARM}" -export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" -export GOROOT_FINAL = "${libdir}/go" -export CGO_ENABLED = "1" -export CC_FOR_TARGET = "${CC}" -export CXX_FOR_TARGET = "${CXX}" -export GO_TARGET_INSTALL = "cmd" -export GO_FLAGS = "-a" - -do_configure[noexec] = "1" - -do_compile() { - export GOBIN="${B}/bin" - export CC="${@d.getVar('BUILD_CC', True).strip()}" - rm -rf ${GOBIN} ${B}/pkg - mkdir ${GOBIN} - - export TMPDIR=${WORKDIR}/build-tmp - mkdir -p ${WORKDIR}/build-tmp - - cd src - ./make.bash - cd ${B} -} - -do_install() { - install -d ${D}${libdir}/go/pkg/tool - cp --preserve=mode,timestamps -R ${B}/pkg/tool/${TARGET_GOTUPLE} ${D}${libdir}/go/pkg/tool/ - install -d ${D}${libdir}/go/src - cp --preserve=mode,timestamps -R ${S}/src/cmd ${D}${libdir}/go/src/ - install -d ${D}${libdir}/go/bin - install -d ${D}${bindir} - for f in ${B}/${GO_BUILD_BINDIR}/*; do - name=`basename $f` - install -m 0755 $f ${D}${libdir}/go/bin/ - ln -sf ../${BASELIB}/go/bin/$name ${D}${bindir}/ - done -} - -PACKAGES = "${PN} ${PN}-dev" -FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" -FILES_${PN}-dev = "${libdir}/go" -RDEPENDS_${PN}-dev = "perl bash" -INSANE_SKIP_${PN} = "ldflags" diff --git a/meta/recipes-devtools/go/go_1.8.bb b/meta/recipes-devtools/go/go_1.8.bb index ef8bc14383..08ab793f86 100644 --- a/meta/recipes-devtools/go/go_1.8.bb +++ b/meta/recipes-devtools/go/go_1.8.bb @@ -1,4 +1,4 @@ require go-${PV}.inc -require go.inc +require go-target.inc TUNE_CCARGS_remove = "-march=mips32r2" SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" -- cgit 1.2.3-korg