Date: Wednesday, April 15, 2020 @ 13:27:26 Author: anthraxx Revision: 614707
upgpkg: aliyun-cli 3.0.37-2: pin dependencies Modified: aliyun-cli/trunk/PKGBUILD ----------+ PKGBUILD | 55 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-15 13:24:54 UTC (rev 614706) +++ PKGBUILD 2020-04-15 13:27:26 UTC (rev 614707) @@ -3,52 +3,62 @@ pkgname=aliyun-cli pkgver=3.0.37 -pkgrel=1 +_jteeuwen_go_bindata_commit=6025e8de665b31fa74ab1a66f2cddd8c0abf887e +_aliyun_openapi_meta_commit=ccaf1ab45d1dc236c81f06ef9db11e41dfbd5d9c +pkgrel=2 pkgdesc='Alibaba Cloud CLI' arch=('x86_64') url='https://github.com/aliyun/aliyun-cli' license=('APACHE') depends=('glibc' 'jq') -makedepends=('git' 'go-pie') -source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha512sums=('9d750ede919ae4ceb405b7e93c1905820b598a855ed581cf85992c11bc534381c943da652a01d75b21d25f04cd8e2a4c4ead99d1cb9cd48384c286ad9db8f941') -b2sums=('2cde5b7714ca4a23ab05c1ed3ae900e37aef9271dab669dd1221376b17b841d4d35cb4c3d8d62fe92feed09c0b28aa6cf24a2db1445ddcf530c0518806a37239') +makedepends=('git' 'go') +source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz + "git+https://github.com/aliyun/aliyun-openapi-meta#commit=${_aliyun_openapi_meta_commit}" + "jteeuwen-go-bindata::git+https://github.com/jteeuwen/go-bindata#commit=${_jteeuwen_go_bindata_commit}") +sha512sums=('9d750ede919ae4ceb405b7e93c1905820b598a855ed581cf85992c11bc534381c943da652a01d75b21d25f04cd8e2a4c4ead99d1cb9cd48384c286ad9db8f941' + 'SKIP' + 'SKIP') +b2sums=('2cde5b7714ca4a23ab05c1ed3ae900e37aef9271dab669dd1221376b17b841d4d35cb4c3d8d62fe92feed09c0b28aa6cf24a2db1445ddcf530c0518806a37239' + 'SKIP' + 'SKIP') prepare() { export GOPATH="${srcdir}/go" - mkdir -p "${GOPATH}/src/github.com/aliyun" + mkdir -p "${GOPATH}/src/github.com/"{aliyun,jteeuwen} ln -rTsf "${pkgname}-${pkgver}" "${GOPATH}/src/github.com/aliyun/${pkgname}" + ln -rTsf aliyun-openapi-meta "${GOPATH}/src/github.com/aliyun/aliyun-openapi-meta" - go get -u github.com/aliyun/aliyun-openapi-meta ||: - # for now we can't use the go-bindata package as this breaks the resulting binary. # The issue has been reported upstream: https://github.com/aliyun/aliyun-cli/issues/262 - go get -u github.com/jteeuwen/go-bindata/... + ln -rTsf jteeuwen-go-bindata "${GOPATH}/src/github.com/jteeuwen/go-bindata" +} +build() { + export GOPATH="${srcdir}/go" export PATH="${GOPATH}/bin:${PATH}" cd "${GOPATH}/src/github.com/aliyun/${pkgname}" - go-bindata \ + export CGO_LDFLAGS="${LDFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -mod=vendor" + + pushd "${srcdir}/jteeuwen-go-bindata/go-bindata" + go build + popd + + "${srcdir}/jteeuwen-go-bindata/go-bindata/go-bindata" \ -o resource/metas.go \ -pkg resource \ -prefix "${GOPATH}/src/github.com/aliyun/aliyun-openapi-meta" \ "${GOPATH}/src/github.com/aliyun/aliyun-openapi-meta/..." -} -build() { - export GOPATH="${srcdir}/go" - - cd "${GOPATH}/src/github.com/aliyun/${pkgname}" - go build \ - -trimpath \ - -mod=vendor \ - -ldflags "-extldflags ${LDFLAGS} -X 'github.com/aliyun/aliyun-cli/cli.Version=${pkgver}'" \ + -ldflags "-X 'github.com/aliyun/aliyun-cli/cli.Version=${pkgver}'" \ -o ./out/aliyun ./main/main.go - - go clean --modcache } check() { @@ -61,13 +71,12 @@ # for now can't test the `./oss/...` folder, because it needs an env file that is not so easy to have in dev go test \ - -race \ ./cli/... ./command/... ./config/... ./i18n/... ./main/... ./openapi/... ./resource/... } package() { cd "${GOPATH}/src/github.com/aliyun/${pkgname}" - install -Dm 755 ./out/aliyun "${pkgdir}/usr/bin/aliyun" + install -Dm 755 out/aliyun "${pkgdir}/usr/bin/aliyun" install -Dm 644 README*.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}" install -Dm 644 bin/README.md -t "${pkgdir}/usr/share/doc/${pkgname}/bin" }