Date: Thursday, March 29, 2018 @ 17:29:00 Author: bpiotrowski Revision: 320626
archrelease: copy trunk to extra-x86_64 Added: go/repos/extra-x86_64/PKGBUILD (from rev 320625, go/trunk/PKGBUILD) go/repos/extra-x86_64/default-buildmode-pie.patch (from rev 320625, go/trunk/default-buildmode-pie.patch) Deleted: go/repos/extra-x86_64/PKGBUILD go/repos/extra-x86_64/default-buildmode-pie.patch -----------------------------+ PKGBUILD | 184 +++++++++++++++++++++--------------------- default-buildmode-pie.patch | 28 +++--- 2 files changed, 106 insertions(+), 106 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-29 17:28:48 UTC (rev 320625) +++ PKGBUILD 2018-03-29 17:29:00 UTC (rev 320626) @@ -1,92 +0,0 @@ -# $Id$ -# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> - -pkgbase=go -pkgname=(go go-pie) -epoch=2 -pkgver=1.10 -pkgrel=2 -arch=(x86_64) -url='http://golang.org/' -license=(BSD) -makedepends=(git go) -source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz - default-buildmode-pie.patch) -sha256sums=('f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24' - '9d2f0d201d4e002d74f548cc82bd131139bab5dd62191004c71dd430fdc1666d') - -export GOOS=linux -case "$CARCH" in - x86_64) export GOARCH=amd64 ;; -esac -export GOROOT_FINAL=/usr/lib/go -export GOROOT_BOOTSTRAP=/usr/lib/go -export GOCACHE=off - -prepare() { - cp -r $pkgbase ${pkgbase}-pie - - cd ${pkgbase}-pie - patch -p1 -i "$srcdir"/default-buildmode-pie.patch -} - -build() { - 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() { - # 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() { - 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 "$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 LICENSE "$pkgdir/usr/share/licenses/go/LICENSE" - install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION" - - rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" - rm -rf "$pkgdir/usr/lib/go/pkg/tool/*/api" -} - -package_go() { - pkgdesc='Core compiler tools for the Go programming language' - provides=(go-pie) - conflicts=(go-pie) - - _package $pkgname -} - -package_go-pie() { - pkgdesc='Core compiler tools for the Go programming language (with PIE enabled by default)' - provides=(go) - conflicts=(go) - - _package $pkgname -} Copied: go/repos/extra-x86_64/PKGBUILD (from rev 320625, go/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-29 17:29:00 UTC (rev 320626) @@ -0,0 +1,92 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgbase=go +pkgname=(go go-pie) +epoch=2 +pkgver=1.10.1 +pkgrel=1 +arch=(x86_64) +url='http://golang.org/' +license=(BSD) +makedepends=(git go) +source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz + default-buildmode-pie.patch) +sha256sums=('589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc' + '9d2f0d201d4e002d74f548cc82bd131139bab5dd62191004c71dd430fdc1666d') + +export GOOS=linux +case "$CARCH" in + x86_64) export GOARCH=amd64 ;; +esac +export GOROOT_FINAL=/usr/lib/go +export GOROOT_BOOTSTRAP=/usr/lib/go +export GOCACHE=off + +prepare() { + cp -r $pkgbase ${pkgbase}-pie + + cd ${pkgbase}-pie + patch -p1 -i "$srcdir"/default-buildmode-pie.patch +} + +build() { + 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() { + # 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() { + 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 "$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 LICENSE "$pkgdir/usr/share/licenses/go/LICENSE" + install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION" + + rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" + rm -rf "$pkgdir/usr/lib/go/pkg/tool/*/api" +} + +package_go() { + pkgdesc='Core compiler tools for the Go programming language' + provides=(go-pie) + conflicts=(go-pie) + + _package $pkgname +} + +package_go-pie() { + pkgdesc='Core compiler tools for the Go programming language (with PIE enabled by default)' + provides=(go) + conflicts=(go) + + _package $pkgname +} Deleted: default-buildmode-pie.patch =================================================================== --- default-buildmode-pie.patch 2018-03-29 17:28:48 UTC (rev 320625) +++ default-buildmode-pie.patch 2018-03-29 17:29:00 UTC (rev 320626) @@ -1,14 +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 -@@ -111,7 +111,8 @@ func buildModeInit() { - ldBuildmode = "c-shared" - case "default": - switch platform { -- case "android/arm", "android/arm64", "android/amd64", "android/386": -+ case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le", -+ "android/arm", "android/arm64", "android/amd64", "android/386": - codegenArg = "-shared" - ldBuildmode = "pie" - case "darwin/arm", "darwin/arm64": Copied: go/repos/extra-x86_64/default-buildmode-pie.patch (from rev 320625, go/trunk/default-buildmode-pie.patch) =================================================================== --- default-buildmode-pie.patch (rev 0) +++ default-buildmode-pie.patch 2018-03-29 17:29:00 UTC (rev 320626) @@ -0,0 +1,14 @@ +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 +@@ -111,7 +111,8 @@ func buildModeInit() { + ldBuildmode = "c-shared" + case "default": + switch platform { +- case "android/arm", "android/arm64", "android/amd64", "android/386": ++ case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le", ++ "android/arm", "android/arm64", "android/amd64", "android/386": + codegenArg = "-shared" + ldBuildmode = "pie" + case "darwin/arm", "darwin/arm64":