Date: Monday, May 18, 2020 @ 17:43:17 Author: foxboron Revision: 629585
archrelease: copy trunk to community-x86_64 Added: go/repos/community-x86_64/PKGBUILD (from rev 629584, go/trunk/PKGBUILD) Deleted: go/repos/community-x86_64/PKGBUILD go/repos/community-x86_64/default-buildmode-pie.patch -----------------------------+ PKGBUILD | 191 +++++++++++++++++------------------------- default-buildmode-pie.patch | 13 -- 2 files changed, 80 insertions(+), 124 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-18 17:43:07 UTC (rev 629584) +++ PKGBUILD 2020-05-18 17:43:17 UTC (rev 629585) @@ -1,111 +0,0 @@ -# Maintainer: Morten Linderud <foxbo...@archlinux.org> -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Alexander F. Rødseth <xypr...@archlinux.org> -# Contributor: Pierre Neidhardt <ambre...@gmail.com> -# Contributor: Vesa Kaihlavirta <ve...@iki.fi> -# Contributor: Rémy Oudompheng <r...@archlinux.org> -# Contributor: Andres Perera <andres87p gmail> -# Contributor: Matthew Bauer <mjbaue...@gmail.com> -# Contributor: Christian Himpel <chres...@gmail.com> -# Contributor: Mike Rosset <mike.ros...@gmail.com> -# Contributor: Daniel YC Lin <dlin...@gmail.com> -# Contributor: John Luebs <jklu...@gmail.com> - -pkgbase=go -pkgname=(go go-pie) -epoch=2 -pkgver=1.14.2 -pkgrel=1 -arch=(x86_64) -url='https://golang.org/' -license=(BSD) -makedepends=(git go perl) -source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz - default-buildmode-pie.patch) -sha256sums=('98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c' - 'be1269689de3cf5c926cf7de07f88d2a6d1ecbfc86694baaf5baee3bdcfdd79a') - -prepare() { - cp -r $pkgbase $pkgbase-pie - cd $pkgbase-pie - patch -p1 -i "$srcdir/default-buildmode-pie.patch" -} - -build() { - export GOARCH=amd64 - export GOROOT_FINAL=/usr/lib/go - export GOROOT_BOOTSTRAP=/usr/lib/go - export GOPATH="$srcdir/" - - for _pkgname in ${pkgname[@]}; do - export GOROOT="$srcdir/$_pkgname" - export GOBIN="$GOROOT/bin" - - cd "$srcdir/$_pkgname/src" - ./make.bash --no-clean -v - - PATH="$GOBIN:$PATH" go install -v -buildmode=shared std - PATH="$GOBIN:$PATH" go install -v -race std - done -} - -check() { - export GOARCH=amd64 - export GOROOT_FINAL=/usr/lib/go - export GOROOT_BOOTSTRAP=/usr/lib/go - # Run test suite only for unpatched Go as it expects non-PIE ldBuildmode - export GOROOT="$srcdir/$pkgbase" - export GOBIN="$GOROOT/bin" - export PATH="$srcdir/$pkgbase/bin:$PATH" - export GO_TEST_TIMEOUT_SCALE=2 - - cd $pkgbase/src - ./run.bash --no-rebuild -v -v -v -k -} - -_package() { - export GOARCH=amd64 - export GOROOT_FINAL=/usr/lib/go - export GOROOT_BOOTSTRAP=/usr/lib/go - - options=(!strip staticlibs) - cd "$srcdir/$1" - - install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go" - cp -a bin pkg src lib misc api test "$pkgdir/usr/lib/go" - cp -r doc/* "$pkgdir/usr/share/doc/go" - - ln -sf /usr/lib/go/bin/go "$pkgdir/usr/bin/go" - ln -sf /usr/lib/go/bin/gofmt "$pkgdir/usr/bin/gofmt" - ln -sf /usr/share/doc/go "$pkgdir/usr/lib/go/doc" - - install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION" - - rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" "$pkgdir/usr/lib/go/pkg/tool/*/api" - - # TODO: Figure out if really needed - rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build/* - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$1/LICENSE" -} - -package_go() { - pkgdesc='Core compiler tools for the Go programming language' - - _package $pkgname -} - -package_go-pie() { - pkgdesc='Core compiler tools for the Go programming language (with PIE enabled by default)' - provides=("go=$epoch:$pkgver-$pkgrel") - conflicts=(go) - - _package $pkgname - - # linux_amd64 is essentially the content of linux_amd64_shared, however there might - # be cases where the user could generate the _shared directory as it's missing in go-pie. - # Make sure it exists without rebuilding std with -buildmode=pie. - cp -a "$pkgdir/usr/lib/go/pkg/linux_amd64/" "$pkgdir/usr/lib/go/pkg/linux_amd64_shared" -} - -# vim: ts=2 sw=2 et Copied: go/repos/community-x86_64/PKGBUILD (from rev 629584, go/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-18 17:43:17 UTC (rev 629585) @@ -0,0 +1,80 @@ +# Maintainer: Morten Linderud <foxbo...@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Alexander F. Rødseth <xypr...@archlinux.org> +# Contributor: Pierre Neidhardt <ambre...@gmail.com> +# Contributor: Vesa Kaihlavirta <ve...@iki.fi> +# Contributor: Rémy Oudompheng <r...@archlinux.org> +# Contributor: Andres Perera <andres87p gmail> +# Contributor: Matthew Bauer <mjbaue...@gmail.com> +# Contributor: Christian Himpel <chres...@gmail.com> +# Contributor: Mike Rosset <mike.ros...@gmail.com> +# Contributor: Daniel YC Lin <dlin...@gmail.com> +# Contributor: John Luebs <jklu...@gmail.com> + +pkgname=go +epoch=2 +pkgver=1.14.3 +pkgrel=1 +pkgdesc='Core compiler tools for the Go programming language' +arch=(x86_64) +url='https://golang.org/' +license=(BSD) +makedepends=(git go perl) +replaces=(go-pie) +provides=(go-pie) +options=(!strip staticlibs) +source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz{,.asc}) +validpgpkeys=('EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796') +sha256sums=('93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56' + 'SKIP') + +build() { + export GOARCH=amd64 + export GOROOT_FINAL=/usr/lib/go + export GOROOT_BOOTSTRAP=/usr/lib/go + export GOPATH="$srcdir/" + export GOROOT="$srcdir/$pkgname" + export GOBIN="$GOROOT/bin" + + cd "$pkgname/src" + ./make.bash --no-clean -v + + PATH="$GOBIN:$PATH" go install -v -race std + PATH="$GOBIN:$PATH" go install -v -buildmode=shared std +} + +check() { + export GOARCH=amd64 + export GOROOT_FINAL=/usr/lib/go + export GOROOT_BOOTSTRAP=/usr/lib/go + export GOROOT="$srcdir/$pkgname" + export GOBIN="$GOROOT/bin" + export PATH="$srcdir/$pkgname/bin:$PATH" + export GO_TEST_TIMEOUT_SCALE=2 + + cd $pkgname/src + ./run.bash --no-rebuild -v -v -v -k +} + +package() { + cd "$pkgname" + + install -d "$pkgdir/usr/bin" "$pkgdir/usr/lib/go" "$pkgdir/usr/share/doc/go" + cp -a bin pkg src lib misc api test "$pkgdir/usr/lib/go" + cp -r doc/* "$pkgdir/usr/share/doc/go" + + ln -sf /usr/lib/go/bin/go "$pkgdir/usr/bin/go" + ln -sf /usr/lib/go/bin/gofmt "$pkgdir/usr/bin/gofmt" + ln -sf /usr/share/doc/go "$pkgdir/usr/lib/go/doc" + + install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION" + + rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" "$pkgdir/usr/lib/go/pkg/tool/*/api" + + # TODO: Figure out if really needed + rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build/* + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim: ts=2 sw=2 et Deleted: default-buildmode-pie.patch =================================================================== --- default-buildmode-pie.patch 2020-05-18 17:43:07 UTC (rev 629584) +++ default-buildmode-pie.patch 2020-05-18 17:43:17 UTC (rev 629585) @@ -1,13 +0,0 @@ -diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go -index 7f894f5..a517887 100644 ---- a/src/cmd/go/internal/work/init.go -+++ b/src/cmd/go/internal/work/init.go -@@ -131,7 +131,7 @@ func buildModeInit() { - ldBuildmode = "c-shared" - case "default": - switch cfg.Goos { -- case "android": -+ case "android", "linux": - codegenArg = "-shared" - ldBuildmode = "pie" - case "darwin":